javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(reorder): item click handlers dont fire when tapping on reorder icon

Browse Source
This commit is contained in:
Perry Govier
2014-08-19 11:32:35 -05:00
parent d18f0f77cd
commit cc18a64bf4
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/angular/directive/itemReorderButton.js vendored
View File

@@ -67,6 +67,11 @@ IonicModule
});
};
// prevent clicks from bubbling up to the item
if(!$attr['ngClick'] && !$attr['onClick'] && !$attr['onclick']){
$element[0].onclick = function(e){e.stopPropagation(); return false;};
}
var container = jqLite(ITEM_TPL_REORDER_BUTTON);
container.append($element);
itemCtrl.$element.append(container).addClass('item-right-editable');

17
test/unit/angular/directive/item.unit.js
View File

@@ -114,6 +114,23 @@ describe('ionReorderButton directive', function() {
expect(reorderContainer.hasClass('visible')).toBe(true);
expect(reorderContainer.hasClass('active')).toBe(true);
}));
it('should allow click handlers, but not bubble up to item\'s click event', inject(function($compile, $rootScope) {
$rootScope.click = jasmine.createSpy('click');;
var el = angular.element('<ion-item ng-click="click()"><ion-reorder-button></ion-reorder-button></ion-item>');
$compile(el)($rootScope);
$rootScope.$apply();
var reorderContainer = angular.element(el[0].querySelector('ion-reorder-button'));
reorderContainer.triggerHandler('click');
expect($rootScope.click).not.toHaveBeenCalled();
var el = angular.element('<ion-item><ion-reorder-button ng-click="click()"></ion-reorder-button></ion-item>');
$compile(el)($rootScope);
$rootScope.$apply();
var reorderContainer = angular.element(el[0].querySelector('ion-reorder-button'));
reorderContainer.triggerHandler('click');
expect($rootScope.click).toHaveBeenCalled();
}));
});
describe('ionOptionButton directive', function() {