Skip to content

Commit 6f9881e

Browse files
committedMay 27, 2016
v1.5.7-build.4837+sha.f58d4fb
1 parent 99ab9c6 commit 6f9881e

5 files changed

+72
-69
lines changed
 

‎angular-animate.js

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.6
2+
* @license AngularJS v1.5.7-build.4837+sha.f58d4fb
33
* (c) 2010-2016 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -809,7 +809,7 @@ function parseMaxTime(str) {
809809
forEach(values, function(value) {
810810
// it's always safe to consider only second values and omit `ms` values since
811811
// getComputedStyle will always handle the conversion for us
812-
if (value.charAt(value.length - 1) == 's') {
812+
if (value.charAt(value.length - 1) === 's') {
813813
value = value.substring(0, value.length - 1);
814814
}
815815
value = parseFloat(value) || 0;
@@ -1130,7 +1130,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
11301130
var flags = {};
11311131
flags.hasTransitions = timings.transitionDuration > 0;
11321132
flags.hasAnimations = timings.animationDuration > 0;
1133-
flags.hasTransitionAll = flags.hasTransitions && timings.transitionProperty == 'all';
1133+
flags.hasTransitionAll = flags.hasTransitions && timings.transitionProperty === 'all';
11341134
flags.applyTransitionDuration = hasToStyles && (
11351135
(flags.hasTransitions && !flags.hasTransitionAll)
11361136
|| (flags.hasAnimations && !flags.hasTransitions));
@@ -1422,7 +1422,7 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
14221422
$$jqLite.addClass(element, activeClasses);
14231423

14241424
if (flags.recalculateTimingStyles) {
1425-
fullClassName = node.className + ' ' + preparationClasses;
1425+
fullClassName = node.getAttribute('class') + ' ' + preparationClasses;
14261426
cacheKey = gcsHashFn(node, fullClassName);
14271427

14281428
timings = computeTimings(node, fullClassName, cacheKey);
@@ -1843,7 +1843,7 @@ var $$AnimateJsProvider = ['$animateProvider', function($animateProvider) {
18431843
var before, after;
18441844
if (animations.length) {
18451845
var afterFn, beforeFn;
1846-
if (event == 'leave') {
1846+
if (event === 'leave') {
18471847
beforeFn = 'leave';
18481848
afterFn = 'afterLeave'; // TODO(matsko): get rid of this
18491849
} else {
@@ -2205,7 +2205,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
22052205
rules.skip.push(function(element, newAnimation, currentAnimation) {
22062206
// why should we trigger a new structural animation if the element will
22072207
// be removed from the DOM anyway?
2208-
return currentAnimation.event == 'leave' && newAnimation.structural;
2208+
return currentAnimation.event === 'leave' && newAnimation.structural;
22092209
});
22102210

22112211
rules.skip.push(function(element, newAnimation, currentAnimation) {
@@ -2245,8 +2245,10 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
22452245

22462246
this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$HashMap',
22472247
'$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite', '$$forceReflow',
2248+
'$$isDocumentHidden',
22482249
function($$rAF, $rootScope, $rootElement, $document, $$HashMap,
2249-
$$animation, $$AnimateRunner, $templateRequest, $$jqLite, $$forceReflow) {
2250+
$$animation, $$AnimateRunner, $templateRequest, $$jqLite, $$forceReflow,
2251+
$$isDocumentHidden) {
22502252

22512253
var activeAnimationsLookup = new $$HashMap();
22522254
var disabledElementsLookup = new $$HashMap();
@@ -2502,15 +2504,15 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
25022504
return runner;
25032505
}
25042506

2505-
var className = [node.className, options.addClass, options.removeClass].join(' ');
2507+
var className = [node.getAttribute('class'), options.addClass, options.removeClass].join(' ');
25062508
if (!isAnimatableClassName(className)) {
25072509
close();
25082510
return runner;
25092511
}
25102512

25112513
var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
25122514

2513-
var documentHidden = $document[0].hidden;
2515+
var documentHidden = $$isDocumentHidden();
25142516

25152517
// this is a hard disable of all animations for the application or on
25162518
// the element itself, therefore there is no need to continue further
@@ -2523,7 +2525,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
25232525

25242526
// there is no point in traversing the same collection of parent ancestors if a followup
25252527
// animation will be run on the same element that already did all that checking work
2526-
if (!skipAnimations && (!hasExistingAnimation || existingAnimation.state != PRE_DIGEST_STATE)) {
2528+
if (!skipAnimations && (!hasExistingAnimation || existingAnimation.state !== PRE_DIGEST_STATE)) {
25272529
skipAnimations = !areAnimationsAllowed(element, parent, event);
25282530
}
25292531

@@ -3935,7 +3937,7 @@ var ngAnimateSwapDirective = ['$animate', '$rootScope', function($animate, $root
39353937
deps="angular-animate.js;angular-route.js"
39363938
animations="true">
39373939
<file name="index.html">
3938-
<a href="#/">Home</a>
3940+
<a href="#!/">Home</a>
39393941
<hr />
39403942
<div class="view-container">
39413943
<div ng-view class="view"></div>
@@ -3982,7 +3984,7 @@ var ngAnimateSwapDirective = ['$animate', '$rootScope', function($animate, $root
39823984
<h2>Welcome to the home page</h1>
39833985
<p>Please click on an element</p>
39843986
<a class="record"
3985-
ng-href="#/profile/{{ record.id }}"
3987+
ng-href="#!/profile/{{ record.id }}"
39863988
ng-animate-ref="{{ record.id }}"
39873989
ng-repeat="record in records">
39883990
{{ record.title }}

‎angular-animate.min.js

+52-51
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎angular-animate.min.js.map

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "angular-animate",
3-
"version": "1.5.6",
3+
"version": "1.5.7-build.4837+sha.f58d4fb",
44
"license": "MIT",
55
"main": "./angular-animate.js",
66
"ignore": [],
77
"dependencies": {
8-
"angular": "1.5.6"
8+
"angular": "1.5.7-build.4837+sha.f58d4fb"
99
}
1010
}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-animate",
3-
"version": "1.5.6",
3+
"version": "1.5.7-build.4837+sha.f58d4fb",
44
"description": "AngularJS module for animations",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)
Please sign in to comment.