Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.

Commit a8ac6e2

Browse files
committed
v1.5.0-build.4274+sha.240d589
1 parent 4a4825f commit a8ac6e2

34 files changed

+116
-115
lines changed

snapshot/angular-animate.js

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* @license AngularJS v1.5.0-build.4273+sha.8b27c3f
2+
* @license AngularJS v1.5.0-build.4274+sha.240d589
33
* (c) 2010-2015 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
@@ -373,12 +373,6 @@ function concatWithSpace(a,b) {
373373
return a + ' ' + b;
374374
}
375375

376-
function $$BodyProvider() {
377-
this.$get = ['$document', function($document) {
378-
return jqLite($document[0].body);
379-
}];
380-
}
381-
382376
var $$rAFSchedulerFactory = ['$$rAF', function($$rAF) {
383377
var queue, cancelFn;
384378

@@ -1382,16 +1376,25 @@ var $$AnimateCssDriverProvider = ['$$animationProvider', function($$animationPro
13821376
var NG_OUT_ANCHOR_CLASS_NAME = 'ng-anchor-out';
13831377
var NG_IN_ANCHOR_CLASS_NAME = 'ng-anchor-in';
13841378

1385-
this.$get = ['$animateCss', '$rootScope', '$$AnimateRunner', '$rootElement', '$$body', '$sniffer', '$$jqLite',
1386-
function($animateCss, $rootScope, $$AnimateRunner, $rootElement, $$body, $sniffer, $$jqLite) {
1379+
function isDocumentFragment(node) {
1380+
return node.parentNode && node.parentNode.nodeType === 11;
1381+
}
1382+
1383+
this.$get = ['$animateCss', '$rootScope', '$$AnimateRunner', '$rootElement', '$sniffer', '$$jqLite', '$document',
1384+
function($animateCss, $rootScope, $$AnimateRunner, $rootElement, $sniffer, $$jqLite, $document) {
13871385

13881386
// only browsers that support these properties can render animations
13891387
if (!$sniffer.animations && !$sniffer.transitions) return noop;
13901388

1391-
var bodyNode = getDomNode($$body);
1389+
var bodyNode = $document[0].body;
13921390
var rootNode = getDomNode($rootElement);
13931391

1394-
var rootBodyElement = jqLite(bodyNode.parentNode === rootNode ? bodyNode : rootNode);
1392+
var rootBodyElement = jqLite(
1393+
// this is to avoid using something that exists outside of the body
1394+
// we also special case the doc fragement case because our unit test code
1395+
// appends the $rootElement to the body after the app has been bootstrapped
1396+
isDocumentFragment(rootNode) || bodyNode.contains(rootNode) ? rootNode : bodyNode
1397+
);
13951398

13961399
var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
13971400

@@ -2018,9 +2021,9 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
20182021
return (nO.addClass && nO.addClass === cO.removeClass) || (nO.removeClass && nO.removeClass === cO.addClass);
20192022
});
20202023

2021-
this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$body', '$$HashMap',
2024+
this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$HashMap',
20222025
'$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite', '$$forceReflow',
2023-
function($$rAF, $rootScope, $rootElement, $document, $$body, $$HashMap,
2026+
function($$rAF, $rootScope, $rootElement, $document, $$HashMap,
20242027
$$animation, $$AnimateRunner, $templateRequest, $$jqLite, $$forceReflow) {
20252028

20262029
var activeAnimationsLookup = new $$HashMap();
@@ -2480,7 +2483,8 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
24802483
}
24812484

24822485
function areAnimationsAllowed(element, parentElement, event) {
2483-
var bodyElementDetected = isMatchingElement(element, $$body) || element[0].nodeName === 'HTML';
2486+
var bodyElement = jqLite($document[0].body);
2487+
var bodyElementDetected = isMatchingElement(element, bodyElement) || element[0].nodeName === 'HTML';
24842488
var rootElementDetected = isMatchingElement(element, $rootElement);
24852489
var parentAnimationDetected = false;
24862490
var animateChildren;
@@ -2536,7 +2540,7 @@ var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
25362540
if (!bodyElementDetected) {
25372541
// we also need to ensure that the element is or will be apart of the body element
25382542
// otherwise it is pointless to even issue an animation to be rendered
2539-
bodyElementDetected = isMatchingElement(parentElement, $$body);
2543+
bodyElementDetected = isMatchingElement(parentElement, bodyElement);
25402544
}
25412545

25422546
parentElement = parentElement.parent();
@@ -3127,7 +3131,6 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
31273131

31283132
/* global angularAnimateModule: true,
31293133
3130-
$$BodyProvider,
31313134
$$AnimateAsyncRunFactory,
31323135
$$rAFSchedulerFactory,
31333136
$$AnimateChildrenDirective,
@@ -3867,8 +3870,6 @@ var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
38673870
* Click here {@link ng.$animate to learn more about animations with `$animate`}.
38683871
*/
38693872
angular.module('ngAnimate', [])
3870-
.provider('$$body', $$BodyProvider)
3871-
38723873
.directive('ngAnimateChildren', $$AnimateChildrenDirective)
38733874
.factory('$$rAFScheduler', $$rAFSchedulerFactory)
38743875

snapshot/angular-animate.min.js

Lines changed: 48 additions & 48 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: 2 additions & 2 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.5.0-build.4273+sha.8b27c3f
2+
* @license AngularJS v1.5.0-build.4274+sha.240d589
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.5.0-build.4273+sha.8b27c3f
2+
* @license AngularJS v1.5.0-build.4274+sha.240d589
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.5.0-build.4273+sha.8b27c3f
2+
* @license AngularJS v1.5.0-build.4274+sha.240d589
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.5.0-build.4273+sha.8b27c3f/' +
62+
message += '\nhttp://errors.angularjs.org/1.5.0-build.4274+sha.240d589/' +
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)