summaryrefslogtreecommitdiff
path: root/xstatic/pkg/angular/data/angular-animate.js
diff options
context:
space:
mode:
Diffstat (limited to 'xstatic/pkg/angular/data/angular-animate.js')
-rw-r--r--xstatic/pkg/angular/data/angular-animate.js33
1 files changed, 19 insertions, 14 deletions
diff --git a/xstatic/pkg/angular/data/angular-animate.js b/xstatic/pkg/angular/data/angular-animate.js
index 7d09d78..cd835d0 100644
--- a/xstatic/pkg/angular/data/angular-animate.js
+++ b/xstatic/pkg/angular/data/angular-animate.js
@@ -1,5 +1,5 @@
/**
- * @license AngularJS v1.3.7
+ * @license AngularJS v1.3.18
* (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
@@ -438,9 +438,11 @@ angular.module('ngAnimate', ['ng'])
//so that all the animated elements within the animation frame
//will be properly updated and drawn on screen. This is
//required to perform multi-class CSS based animations with
- //Firefox. DO NOT REMOVE THIS LINE.
- var a = bod.offsetWidth + 1;
- fn();
+ //Firefox. DO NOT REMOVE THIS LINE. DO NOT OPTIMIZE THIS LINE.
+ //THE MINIFIER WILL REMOVE IT OTHERWISE WHICH WILL RESULT IN AN
+ //UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND WILL
+ //TAKE YEARS AWAY FROM YOUR LIFE!
+ fn(bod.offsetWidth);
});
};
}])
@@ -839,7 +841,8 @@ angular.module('ngAnimate', ['ng'])
* promise that was returned when the animation was started.
*
* ```js
- * var promise = $animate.addClass(element, 'super-long-animation').then(function() {
+ * var promise = $animate.addClass(element, 'super-long-animation');
+ * promise.then(function() {
* //this will still be called even if cancelled
* });
*
@@ -1197,18 +1200,21 @@ angular.module('ngAnimate', ['ng'])
}
return cache.promise = runAnimationPostDigest(function(done) {
- var parentElement = element.parent();
- var elementNode = extractElementNode(element);
- var parentNode = elementNode.parentNode;
+ var cache, parentNode, parentElement, elementNode = extractElementNode(element);
+ if (elementNode) {
+ cache = element.data(STORAGE_KEY);
+ element.removeData(STORAGE_KEY);
+
+ parentElement = element.parent();
+ parentNode = elementNode.parentNode;
+ }
+
// TODO(matsko): move this code into the animationsDisabled() function once #8092 is fixed
if (!parentNode || parentNode['$$NG_REMOVED'] || elementNode['$$NG_REMOVED']) {
done();
return;
}
- var cache = element.data(STORAGE_KEY);
- element.removeData(STORAGE_KEY);
-
var state = element.data(NG_ANIMATE_STATE) || {};
var classes = resolveElementClasses(element, cache, state.active);
return !classes
@@ -1332,8 +1338,7 @@ angular.module('ngAnimate', ['ng'])
} else if (lastAnimation.event == 'setClass') {
animationsToCancel.push(lastAnimation);
cleanup(element, className);
- }
- else if (runningAnimations[className]) {
+ } else if (runningAnimations[className]) {
var current = runningAnimations[className];
if (current.event == animationEvent) {
skipAnimation = true;
@@ -1874,7 +1879,7 @@ angular.module('ngAnimate', ['ng'])
return;
}
- if (!staggerTime && styles) {
+ if (!staggerTime && styles && Object.keys(styles).length > 0) {
if (!timings.transitionDuration) {
element.css('transition', timings.animationDuration + 's linear all');
appliedStyles.push('transition');