javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

toolbar refactor wip

Browse Source
This commit is contained in:
Adam Bradley
2015-09-16 00:42:22 -05:00
parent a97d7300de
commit abff83a206
14 changed files with 261 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/transitions/ios-transition.ts
View File

@ -66,7 +66,7 @@ class IOSTransition extends Transition {
.to(OPACITY, 0);
if (this.leaving.enableBack() && this.viewWidth() > 200) {
let leavingBackButtonText = new Animation(this.leaving.backButtonTextElement());
let leavingBackButtonText = new Animation(this.leaving.backBtnTextRef());
leavingBackButtonText.fromTo(TRANSLATEX, CENTER, (this.viewWidth() / 2) + 'px');
this.leavingNavbar.add(leavingBackButtonText);
}
@ -93,7 +93,7 @@ class IOSTransition extends Transition {
.to(OPACITY, 0);
if (this.entering.enableBack() && this.viewWidth() > 200) {
let enteringBackButtonText = new Animation(this.entering.backButtonTextElement());
let enteringBackButtonText = new Animation(this.entering.backBtnTextRef());
enteringBackButtonText.fromTo(TRANSLATEX, (this.viewWidth() / 2) + 'px', CENTER);
this.enteringNavbar.add(enteringBackButtonText);
}

16
ionic/transitions/transition.ts
View File

@ -29,23 +29,23 @@ export class Transition extends Animation {
if (opts.navbar !== false) {
let enteringNavbar = this.enteringNavbar = new Animation(enteringItem.navbarElement());
let enteringNavbar = this.enteringNavbar = new Animation(enteringItem.navbarRef());
enteringNavbar.before.addClass(SHOW_NAVBAR_CSS);
if (enteringItem.enableBack()) {
// only animate in the back button if the entering view has it enabled
let enteringBackButton = this.enteringBackButton = new Animation(enteringItem.backButtonElement());
let enteringBackButton = this.enteringBackButton = new Animation(enteringItem.backBtnRef());
enteringBackButton
.before.addClass(SHOW_BACK_BUTTON)
.fadeIn();
enteringNavbar.add(enteringBackButton);
}
this.enteringTitle = new Animation(enteringItem.titleElement());
this.enteringTitle = new Animation(enteringItem.titleRef());
enteringNavbar.add(this.enteringTitle);
this.add(enteringNavbar);
this.enteringNavbarItems = new Animation(enteringItem.navbarItemElements())
this.enteringNavbarItems = new Animation(enteringItem.navbarItemRefs());
this.enteringNavbarItems.fadeIn();
enteringNavbar.add(this.enteringNavbarItems);
}
@ -56,19 +56,19 @@ export class Transition extends Animation {
this.leavingView = new Animation(leavingItem.viewElementRef());
this.leavingView.after.removeClass(SHOW_VIEW_CSS);
let leavingNavbar = this.leavingNavbar = new Animation(leavingItem.navbarElement());
let leavingNavbar = this.leavingNavbar = new Animation(leavingItem.navbarRef());
leavingNavbar.after.removeClass(SHOW_NAVBAR_CSS);
let leavingBackButton = this.leavingBackButton = new Animation(leavingItem.backButtonElement());
let leavingBackButton = this.leavingBackButton = new Animation(leavingItem.backBtnRef());
leavingBackButton
.after.removeClass(SHOW_BACK_BUTTON)
.fadeOut();
leavingNavbar.add(leavingBackButton);
this.leavingTitle = new Animation(leavingItem.titleElement());
this.leavingTitle = new Animation(leavingItem.titleRef());
leavingNavbar.add(this.leavingTitle);
this.leavingNavbarItems = new Animation(leavingItem.navbarItemElements());
this.leavingNavbarItems = new Animation(leavingItem.navbarItemRefs());
this.leavingNavbarItems.fadeOut();
leavingNavbar.add(this.leavingNavbarItems);