Skip to content

Commit ee7e4d0

Browse files
committed
v1.4.4-build.4167+sha.d33cedd
1 parent 4986f79 commit ee7e4d0

32 files changed

+108
-139
lines changed
9.46 MB
Binary file not shown.

snapshot/angular-animate.js

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.4-build.4166+sha.6838c97
2+
* @license AngularJS v1.4.4-build.4167+sha.d33cedd
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -1942,9 +1942,9 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
19421942
});
19431943

19441944
this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$body', '$$HashMap',
1945-
'$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite',
1945+
'$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite', '$$forceReflow',
19461946
function($$rAF, $rootScope, $rootElement, $document, $$body, $$HashMap,
1947-
$$animation, $$AnimateRunner, $templateRequest, $$jqLite) {
1947+
$$animation, $$AnimateRunner, $templateRequest, $$jqLite, $$forceReflow) {
19481948

19491949
var activeAnimationsLookup = new $$HashMap();
19501950
var disabledElementsLookup = new $$HashMap();
@@ -2318,6 +2318,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
23182318

23192319
markElementAnimationState(element, RUNNING_STATE);
23202320
var realRunner = $$animation(element, event, animationDetails.options, function(e) {
2321+
$$forceReflow();
23212322
blockTransitions(getDomNode(e), false);
23222323
});
23232324

@@ -2633,8 +2634,8 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
26332634
return element.data(RUNNER_STORAGE_KEY);
26342635
}
26352636

2636-
this.$get = ['$$jqLite', '$rootScope', '$injector', '$$AnimateRunner', '$$HashMap', '$$forceReflow',
2637-
function($$jqLite, $rootScope, $injector, $$AnimateRunner, $$HashMap, $$forceReflow) {
2637+
this.$get = ['$$jqLite', '$rootScope', '$injector', '$$AnimateRunner', '$$HashMap',
2638+
function($$jqLite, $rootScope, $injector, $$AnimateRunner, $$HashMap) {
26382639

26392640
var animationQueue = [];
26402641
var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
@@ -2705,11 +2706,8 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
27052706
result = result.concat(row);
27062707
row = [];
27072708
}
2708-
row.push({
2709-
fn: entry.fn,
2710-
terminal: entry.children.length === 0
2711-
});
2712-
entry.children.forEach(function(childEntry) {
2709+
row.push(entry.fn);
2710+
forEach(entry.children, function(childEntry) {
27132711
nextLevelEntries++;
27142712
queue.push(childEntry);
27152713
});
@@ -2719,17 +2717,7 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
27192717
if (row.length) {
27202718
result = result.concat(row);
27212719
}
2722-
2723-
var terminalAnimations = [];
2724-
var parentAnimations = [];
2725-
forEach(result, function(result) {
2726-
if (result.terminal) {
2727-
terminalAnimations.push(result.fn);
2728-
} else {
2729-
parentAnimations.push(result.fn);
2730-
}
2731-
});
2732-
return [parentAnimations, terminalAnimations];
2720+
return result;
27332721
}
27342722
}
27352723

@@ -2838,27 +2826,9 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
28382826
});
28392827

28402828
// we need to sort each of the animations in order of parent to child
2841-
// relationships. This ensures that the child classes are applied at the
2842-
// right time.
2843-
var anim = sortAnimations(toBeSortedAnimations);
2844-
var finalLevel = anim.length - 1;
2845-
2846-
// sortAnimations will return two lists of animations. The first list
2847-
// is all of the parent animations that are likely class-based and the
2848-
// second list is a collection of the rest. Before we run the second
2849-
// list we must ensure that atleast one reflow has been passed such that
2850-
// the preparation classes (ng-enter, class-add, etc...) have been applied
2851-
// to their associated element.
2852-
if (anim[0].length) {
2853-
forEach(anim[0], function(triggerAnimation) {
2854-
$$forceReflow();
2855-
triggerAnimation();
2856-
});
2857-
} else {
2858-
$$forceReflow();
2859-
}
2860-
2861-
forEach(anim[1], function(triggerAnimation) {
2829+
// relationships. This ensures that the parent to child classes are
2830+
// applied at the right time.
2831+
forEach(sortAnimations(toBeSortedAnimations), function(triggerAnimation) {
28622832
triggerAnimation();
28632833
});
28642834
});

snapshot/angular-animate.min.js

Lines changed: 49 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-animate.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-aria.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.4-build.4166+sha.6838c97
2+
* @license AngularJS v1.4.4-build.4167+sha.d33cedd
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-aria.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-cookies.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.4-build.4166+sha.6838c97
2+
* @license AngularJS v1.4.4-build.4167+sha.d33cedd
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/

snapshot/angular-cookies.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

snapshot/angular-loader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.4.4-build.4166+sha.6838c97
2+
* @license AngularJS v1.4.4-build.4167+sha.d33cedd
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -59,7 +59,7 @@ function minErr(module, ErrorConstructor) {
5959
return match;
6060
});
6161

62-
message += '\nhttp://errors.angularjs.org/1.4.4-build.4166+sha.6838c97/' +
62+
message += '\nhttp://errors.angularjs.org/1.4.4-build.4167+sha.d33cedd/' +
6363
(module ? module + '/' : '') + code;
6464

6565
for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {

snapshot/angular-loader.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)