Skip to content

Commit

Permalink
fix(option-button): works with nested lists
Browse files Browse the repository at this point in the history
* ion-option-button was not working with nested lists

* added release manually
  • Loading branch information
punknroll authored and jgw96 committed Oct 20, 2016
1 parent 417997d commit 6e622a4
Show file tree
Hide file tree
Showing 7 changed files with 55,863 additions and 381 deletions.
4 changes: 2 additions & 2 deletions js/angular/directive/itemOptionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ IonicModule.directive('ionOptionButton', [function() {
return function($scope, $element, $attr, itemCtrl) {
if (!itemCtrl.optionsContainer) {
itemCtrl.optionsContainer = jqLite(ITEM_TPL_OPTION_BUTTONS);
itemCtrl.$element.append(itemCtrl.optionsContainer);
itemCtrl.$element.prepend(itemCtrl.optionsContainer);
}
itemCtrl.optionsContainer.append($element);
itemCtrl.optionsContainer.prepend($element);

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

Expand Down
4 changes: 2 additions & 2 deletions release/js/ionic-angular.js
Original file line number Diff line number Diff line change
Expand Up @@ -11068,9 +11068,9 @@ IonicModule.directive('ionOptionButton', [function() {
return function($scope, $element, $attr, itemCtrl) {
if (!itemCtrl.optionsContainer) {
itemCtrl.optionsContainer = jqLite(ITEM_TPL_OPTION_BUTTONS);
itemCtrl.$element.append(itemCtrl.optionsContainer);
itemCtrl.$element.prepend(itemCtrl.optionsContainer);
}
itemCtrl.optionsContainer.append($element);
itemCtrl.optionsContainer.prepend($element);

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

Expand Down
14,395 changes: 14,391 additions & 4 deletions release/js/ionic-angular.min.js

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions release/js/ionic.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ window.ionic.version = '1.3.1';
// whatever lookup was done to find this element failed to find it
// so we can't listen for events on it.
if(element === null) {
void 0;
console.error('Null element passed to gesture (element does not exist). Not listening for gesture');
return this;
}

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

Expand Down Expand Up @@ -64246,9 +64248,9 @@ IonicModule.directive('ionOptionButton', [function() {
return function($scope, $element, $attr, itemCtrl) {
if (!itemCtrl.optionsContainer) {
itemCtrl.optionsContainer = jqLite(ITEM_TPL_OPTION_BUTTONS);
itemCtrl.$element.append(itemCtrl.optionsContainer);
itemCtrl.$element.prepend(itemCtrl.optionsContainer);
}
itemCtrl.optionsContainer.append($element);
itemCtrl.optionsContainer.prepend($element);

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

Expand Down
28,457 changes: 28,098 additions & 359 deletions release/js/ionic.bundle.min.js

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions release/js/ionic.js
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ window.ionic.version = '1.3.1';
// whatever lookup was done to find this element failed to find it
// so we can't listen for events on it.
if(element === null) {
void 0;
console.error('Null element passed to gesture (element does not exist). Not listening for gesture');
return this;
}

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

Expand Down
13,364 changes: 13,358 additions & 6 deletions release/js/ionic.min.js

Large diffs are not rendered by default.

0 comments on commit 6e622a4

Please sign in to comment.