Skip to content

Commit 6e622a4

Browse files
punknrolljgw96
authored andcommitted
fix(option-button): works with nested lists
* ion-option-button was not working with nested lists * added release manually
1 parent 417997d commit 6e622a4

File tree

7 files changed

+55863
-381
lines changed

7 files changed

+55863
-381
lines changed

Diff for: js/angular/directive/itemOptionButton.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ IonicModule.directive('ionOptionButton', [function() {
4141
return function($scope, $element, $attr, itemCtrl) {
4242
if (!itemCtrl.optionsContainer) {
4343
itemCtrl.optionsContainer = jqLite(ITEM_TPL_OPTION_BUTTONS);
44-
itemCtrl.$element.append(itemCtrl.optionsContainer);
44+
itemCtrl.$element.prepend(itemCtrl.optionsContainer);
4545
}
46-
itemCtrl.optionsContainer.append($element);
46+
itemCtrl.optionsContainer.prepend($element);
4747

4848
itemCtrl.$element.addClass('item-right-editable');
4949

Diff for: release/js/ionic-angular.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -11068,9 +11068,9 @@ IonicModule.directive('ionOptionButton', [function() {
1106811068
return function($scope, $element, $attr, itemCtrl) {
1106911069
if (!itemCtrl.optionsContainer) {
1107011070
itemCtrl.optionsContainer = jqLite(ITEM_TPL_OPTION_BUTTONS);
11071-
itemCtrl.$element.append(itemCtrl.optionsContainer);
11071+
itemCtrl.$element.prepend(itemCtrl.optionsContainer);
1107211072
}
11073-
itemCtrl.optionsContainer.append($element);
11073+
itemCtrl.optionsContainer.prepend($element);
1107411074

1107511075
itemCtrl.$element.addClass('item-right-editable');
1107611076

Diff for: release/js/ionic-angular.min.js

+14,391-4
Large diffs are not rendered by default.

Diff for: release/js/ionic.bundle.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ window.ionic.version = '1.3.1';
734734
// whatever lookup was done to find this element failed to find it
735735
// so we can't listen for events on it.
736736
if(element === null) {
737-
void 0;
737+
console.error('Null element passed to gesture (element does not exist). Not listening for gesture');
738738
return this;
739739
}
740740

@@ -2460,7 +2460,9 @@ window.ionic.version = '1.3.1';
24602460
function verifyPlatformReady() {
24612461
setTimeout(function() {
24622462
if(!self.isReady && self.isWebView()) {
2463-
void 0;
2463+
console.warn('Possible issue: deviceready did not fire in a reasonable amount of time. ' +
2464+
'This can be caused by plugins in an inconsistent state. One possible solution: uninstall/remove all ' +
2465+
'plugins and reinstall them. Additionally, one or more plugins might be faulty or out of date.');
24642466
}
24652467
}, platformReadyTimer);
24662468
}
@@ -6987,7 +6989,7 @@ ionic.scroll = {
69876989
(function(ionic) {
69886990
var NOOP = function() {};
69896991
var deprecated = function(name) {
6990-
void 0;
6992+
console.error('Method not available in native scrolling: ' + name);
69916993
};
69926994
ionic.views.ScrollNative = ionic.views.View.inherit({
69936995

@@ -64246,9 +64248,9 @@ IonicModule.directive('ionOptionButton', [function() {
6424664248
return function($scope, $element, $attr, itemCtrl) {
6424764249
if (!itemCtrl.optionsContainer) {
6424864250
itemCtrl.optionsContainer = jqLite(ITEM_TPL_OPTION_BUTTONS);
64249-
itemCtrl.$element.append(itemCtrl.optionsContainer);
64251+
itemCtrl.$element.prepend(itemCtrl.optionsContainer);
6425064252
}
64251-
itemCtrl.optionsContainer.append($element);
64253+
itemCtrl.optionsContainer.prepend($element);
6425264254

6425364255
itemCtrl.$element.addClass('item-right-editable');
6425464256

Diff for: release/js/ionic.bundle.min.js

+28,098-359
Large diffs are not rendered by default.

Diff for: release/js/ionic.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ window.ionic.version = '1.3.1';
727727
// whatever lookup was done to find this element failed to find it
728728
// so we can't listen for events on it.
729729
if(element === null) {
730-
void 0;
730+
console.error('Null element passed to gesture (element does not exist). Not listening for gesture');
731731
return this;
732732
}
733733

@@ -2453,7 +2453,9 @@ window.ionic.version = '1.3.1';
24532453
function verifyPlatformReady() {
24542454
setTimeout(function() {
24552455
if(!self.isReady && self.isWebView()) {
2456-
void 0;
2456+
console.warn('Possible issue: deviceready did not fire in a reasonable amount of time. ' +
2457+
'This can be caused by plugins in an inconsistent state. One possible solution: uninstall/remove all ' +
2458+
'plugins and reinstall them. Additionally, one or more plugins might be faulty or out of date.');
24572459
}
24582460
}, platformReadyTimer);
24592461
}
@@ -6980,7 +6982,7 @@ ionic.scroll = {
69806982
(function(ionic) {
69816983
var NOOP = function() {};
69826984
var deprecated = function(name) {
6983-
void 0;
6985+
console.error('Method not available in native scrolling: ' + name);
69846986
};
69856987
ionic.views.ScrollNative = ionic.views.View.inherit({
69866988

Diff for: release/js/ionic.min.js

+13,358-6
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)