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

indiana jones and the toolbar crusade

Browse Source
This commit is contained in:
Adam Bradley
2015-05-19 21:59:49 -05:00
parent b0e48d1709
commit 76e84bfaac
8 changed files with 61 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ionic/animations/animation.js
View File

@ -79,7 +79,7 @@ export class Animation {
from(property, value) {
if (!this._from) {
this._from = {}
this._from = {};
}
this._from[property] = value;
return this;
@ -87,7 +87,7 @@ export class Animation {
to(property, value) {
if (!this._to) {
this._to = {}
this._to = {};
}
this._to[property] = value;
return this;
@ -127,8 +127,7 @@ export class Animation {
}
if (!this._to) {
// probably just add/removing classes
// create bogus transition
// probably just add/removing classes, create bogus transition
this._from = this._to = {'opacity': 1};
}
@ -215,7 +214,7 @@ class Animate {
fromEffect = fromEffect || {};
let style = null;
for (let prop in toEffect) {
if (!fromEffect[prop]) {
if (util.isBlank(fromEffect[prop])) {
style = style || window.getComputedStyle(ele);
fromEffect[prop] = style[prop];
}