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

fix iOS easing

Browse Source
This commit is contained in:
Adam Bradley
2015-05-05 14:34:31 -05:00
parent 2e28dbb6cf
commit 9915669859
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/collide/process-element.js
View File

@ -255,7 +255,7 @@ export function processElement(action, animation, elementIndex, clearCache) {
the element's current value. */ the element's current value. */
function parsePropertyValue(valueData, skipResolvingEasing) { function parsePropertyValue(valueData, skipResolvingEasing) {
var endValue = valueData[0]; var endValue = valueData[0];
var easing = skipResolvingEasing ? valueData[1] : getEasing(valueData[1], opts.duration); var easing = skipResolvingEasing ? valueData[1] : getEasing(valueData[1] || opts.easing, opts.duration);
var startValue = valueData[2]; var startValue = valueData[2];
/* Default to the call's easing if a per-property easing type was not defined. */ /* Default to the call's easing if a per-property easing type was not defined. */

9
ionic/components/nav/nav-base.js
View File

@ -186,15 +186,6 @@ export class NavBase {
// resolve that this push has completed // resolve that this push has completed
resolve(); resolve();
// on the next frame, hide the item that's cached
util.dom.raf(() => {
// ensure it's state is still cached
if (leavingItem.state === CACHED_STATE && leavingItem.navItem) {
// CSS default is display:none, so setting to '' does the trick
leavingItem.navItem.domElement.style.display = '';
}
});
}); });
}); });