fix(animations): update wapi polyfill

Do not clear out all inline styles after the web animation api
polypfill has finished.
This commit is contained in:
Adam Bradley
2015-09-06 22:13:03 -05:00
parent 02db50e96d
commit 3c4d36b835
5 changed files with 17 additions and 8 deletions

View File

@@ -457,7 +457,7 @@ class Animate {
return inlineStyle(ele, this.toEffect);
}
this.fill = fill || 'both';
this.fill = fill;
this.ele = ele;
this.promise = new Promise(res => { this.resolve = res; });
@@ -494,7 +494,7 @@ class Animate {
duration: self.duration || 0,
easing: self.easing,
playbackRate: self.rate || 1,
//fill: this.fill
fill: self.fill
});
self.player.onfinish = () => {
@@ -503,6 +503,8 @@ class Animate {
// to its "from" effects
inlineStyle(self.ele, self.rate < 0 ? self.fromEffect : self.toEffect);
self.player = null;
self.resolve();
};
}

View File

@@ -31,9 +31,16 @@
scope.apply(target, interpolation.property, interpolation.interpolation(scaledLocalTime));
});
} else {
for (var property in propertySpecificKeyframeGroups)
if (property != 'offset' && property != 'easing' && property != 'composite')
scope.clear(target, property);
// IONIC HACK!
// DO NOT CLEAR OUT THE INLINE STYLE HERE
// IONIC ANIMATE SETS INLINE STYLES ITSELF AND THE WEB ANIMATIONS API WILL
// OVERWRITE IONIC DUE TO THE ASYNC PROMISES THAT FIRE OFF AFTER ONFINISH
// for (var property in propertySpecificKeyframeGroups)
// if (property != 'offset' && property != 'easing' && property != 'composite')
// scope.clear(target, property);
}
};
};

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long