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(viewSwitcher): do not finish transition from bubbled transitionend events

Browse Source 
Closes #3006. Closes #3063.
This commit is contained in:
Andrew
2015-02-09 11:50:28 -07:00
parent 83cc181800
commit 6fa75b7fff
4 changed files with 73 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
test/unit/angular/service/viewSwitcher.unit.js
View File

@@ -225,4 +225,58 @@ describe('Ionic View Switcher', function() {
expect(switcher.enteringEle().data('$accessed')).toBeDefined();
}));
it('should end the transition on transitionend', inject(function($ionicViewSwitcher, $rootScope, $ionicConfig, $compile) {
$ionicConfig.views.transition('test');
$ionicConfig.transitions.views.test = function() {
return { run: angular.noop, shouldAnimate: true };
};
var afterEnterSpy = jasmine.createSpy('afterEnter');
var navViewCtrl = setup();
var enteringEle = $compile('<enter>')($rootScope);
navViewCtrl.element.append(enteringEle);
enteringEle.data('$eleId', 'foo');
var switcher = $ionicViewSwitcher.create(navViewCtrl, {}, {
viewId: 'foo'
});
switcher.loadViewElements({});
$rootScope.$on('$ionicView.afterEnter', afterEnterSpy);
switcher.transition('forward');
expect(afterEnterSpy).not.toHaveBeenCalled();
enteringEle.triggerHandler('transitionend');
expect(afterEnterSpy).toHaveBeenCalled();
}));
it('should not end the transition on bubbled transitionend', inject(function($ionicViewSwitcher, $rootScope, $ionicConfig, $compile) {
$ionicConfig.views.transition('test');
$ionicConfig.transitions.views.test = function() {
return { run: angular.noop, shouldAnimate: true };
};
var afterEnterSpy = jasmine.createSpy('afterEnter');
var navViewCtrl = setup();
var enteringEle = $compile('<enter>')($rootScope);
navViewCtrl.element.append(enteringEle);
var enteringEleChild = angular.element('<child>');
enteringEle.append(enteringEleChild);
enteringEle.data('$eleId', 'foo');
var switcher = $ionicViewSwitcher.create(navViewCtrl, {}, {
viewId: 'foo'
});
switcher.loadViewElements({});
$rootScope.$on('$ionicView.afterEnter', afterEnterSpy);
switcher.transition('forward');
expect(afterEnterSpy).not.toHaveBeenCalled();
enteringEle.triggerHandler({
type: 'transitionend',
target: enteringEleChild[0]
});
expect(afterEnterSpy).not.toHaveBeenCalled();
}));
});