From 7a541b80d27616042161dcc4c3f2dc85e0678085 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 29 Sep 2015 21:44:43 -0500 Subject: [PATCH] feat(md): increased delay before md transitions --- ionic/animations/animation.ts | 2 +- ionic/transitions/md-transition.ts | 1 + ionic/transitions/transition.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ionic/animations/animation.ts b/ionic/animations/animation.ts index 04f946ec89..aa4bd80926 100644 --- a/ionic/animations/animation.ts +++ b/ionic/animations/animation.ts @@ -243,7 +243,7 @@ export class Animation { }); } - if (self._duration > this._opts.renderDelay) { + if (self._duration > 32) { // begin each animation when everything is rendered in their starting point // give the browser some time to render everything in place before starting setTimeout(kickoff, this._opts.renderDelay); diff --git a/ionic/transitions/md-transition.ts b/ionic/transitions/md-transition.ts index a92bf84ad9..821c4b0a6d 100644 --- a/ionic/transitions/md-transition.ts +++ b/ionic/transitions/md-transition.ts @@ -9,6 +9,7 @@ const CENTER = '0px' class MaterialTransition extends Transition { constructor(nav, opts) { + opts.renderDelay = 160; super(nav, opts); // entering item moves in bottom to center diff --git a/ionic/transitions/transition.ts b/ionic/transitions/transition.ts index 0dcbfb468e..8254615f3b 100644 --- a/ionic/transitions/transition.ts +++ b/ionic/transitions/transition.ts @@ -11,7 +11,7 @@ let TransitionRegistry = {}; export class Transition extends Animation { constructor(nav, opts) { - super(); + super(null, opts); // get the entering and leaving items let enteringView = this.entering = nav.getStagedEnteringView();