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(navBar): only add default animation if there is no custom animation

Browse Source 
Closes #1671
This commit is contained in:
Andrew
2014-07-07 11:40:21 -06:00
parent 22a81fe82c
commit cdba48f196
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/unit/angular/directive/navBar.unit.js
View File

@@ -323,6 +323,12 @@ describe('ionNavBar', function() {
var el = setup();
expect(el.hasClass('nav-title-slide-ios7')).toBe(true);
});
it('should not add transition if animation attribute is defined', function() {
var el = setup('animation="123abc"');
expect(el.hasClass('123abc')).toBe(true);
expect(el.hasClass('nav-title-slide-ios7')).toBe(false);
});
});
describe('Android', function() {
@@ -346,6 +352,12 @@ describe('ionNavBar', function() {
// Nav bar titles don't animation by default on Android
expect(el.hasClass('no-animation')).toBe(true);
});
it('should not add transition if animation attribute is defined', function() {
var el = setup('animation="123abc"');
expect(el.hasClass('123abc')).toBe(true);
expect(el.hasClass('no-animation')).toBe(false);
});
});
});
});