Merge pull request #5 from angular/master

Update upstream

Author: GulajavaMinistudio

bower.json

@@ -2,7 +2,7 @@
   "name": "angularjs",
   "license": "MIT",
   "devDependencies": {
-    "jquery": "3.1.0",
+    "jquery": "3.2.1",
     "jquery-2.2": "jquery#2.2.4",
     "jquery-2.1": "jquery#2.1.4",
     "closure-compiler": "https://dl.google.com/closure-compiler/compiler-20140814.zip",

docs/content/tutorial/step_14.ngdoc

@@ -46,14 +46,14 @@ Since we are using [Bower][bower] to install client-side dependencies, this step
     "angular-resource": "1.5.x",
     "angular-route": "1.5.x",
     "bootstrap": "3.3.x",
-    "jquery": "2.2.x"
+    "jquery": "3.2.x"
   }
 }
 ```
 
 * `"angular-animate": "1.5.x"` tells bower to install a version of the angular-animate module that
   is compatible with version 1.5.x of AngularJS.
-* `"jquery": "2.2.x"` tells bower to install the latest patch release of the 2.2 version of jQuery.
+* `"jquery": "3.2.x"` tells bower to install the latest patch release of the 3.2 version of jQuery.
   Note that this is not an AngularJS library; it is the standard jQuery library. We can use bower to
   install a wide range of 3rd party libraries.
 

package.json

@@ -59,7 +59,7 @@
     "jasmine-core": "^2.4.0",
     "jasmine-node": "^2.0.0",
     "jasmine-reporters": "^2.2.0",
-    "jquery": "^3.1.1",
+    "jquery": "^3.2.1",
     "karma": "^1.1.2",
     "karma-browserstack-launcher": "^1.0.1",
     "karma-chrome-launcher": "^1.0.1",

src/jqLite.js

@@ -201,12 +201,6 @@ function jqLiteHasData(node) {
   return false;
 }
 
-function jqLiteCleanData(nodes) {
-  for (var i = 0, ii = nodes.length; i < ii; i++) {
-    jqLiteRemoveData(nodes[i]);
-  }
-}
-
 function jqLiteBuildFragment(html, context) {
   var tmp, tag, wrap,
       fragment = context.createDocumentFragment(),
@@ -309,13 +303,10 @@ function jqLiteClone(element) {
 }
 
 function jqLiteDealoc(element, onlyDescendants) {
-  if (!onlyDescendants) jqLiteRemoveData(element);
+  if (!onlyDescendants && jqLiteAcceptsData(element)) jqLite.cleanData([element]);
 
   if (element.querySelectorAll) {
-    var descendants = element.querySelectorAll('*');
-    for (var i = 0, l = descendants.length; i < l; i++) {
-      jqLiteRemoveData(descendants[i]);
-    }
+    jqLite.cleanData(element.querySelectorAll('*'));
   }
 }
 
@@ -613,7 +604,11 @@ forEach({
   data: jqLiteData,
   removeData: jqLiteRemoveData,
   hasData: jqLiteHasData,
-  cleanData: jqLiteCleanData
+  cleanData: function jqLiteCleanData(nodes) {
+    for (var i = 0, ii = nodes.length; i < ii; i++) {
+      jqLiteRemoveData(nodes[i]);
+    }
+  }
 }, function(fn, name) {
   JQLite[name] = fn;
 });

src/ng/interval.js

@@ -41,7 +41,7 @@ function $IntervalProvider() {
       * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
       *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
       * @param {...*=} Pass additional parameters to the executed function.
-      * @returns {promise} A promise which will be notified on each iteration.
+      * @returns {promise} A promise which will be notified on each iteration. It will resolve once all iterations of the interval complete.
       *
       * @example
       * <example module="intervalExample" name="interval-service">

test/ng/compileSpec.js

@@ -2100,28 +2100,26 @@ describe('$compile', function() {
 
           it('should work in jqLite and jQuery with jQuery.cleanData last patched by Angular', runTest);
 
-          if (jQuery) {
-            it('should work with another library patching jQuery.cleanData after Angular', function() {
-              var cleanedCount = 0;
-              var currentCleanData = jqLite.cleanData;
-              jqLite.cleanData = function(elems) {
-                cleanedCount += elems.length;
-                // Don't return the output and explicitly pass only the first parameter
-                // so that we're sure we're not relying on either of them. jQuery UI patch
-                // behaves in this way.
-                currentCleanData(elems);
-              };
+          it('should work with another library patching jqLite/jQuery.cleanData after Angular', function() {
+            var cleanedCount = 0;
+            var currentCleanData = jqLite.cleanData;
+            jqLite.cleanData = function(elems) {
+              cleanedCount += elems.length;
+              // Don't return the output and explicitly pass only the first parameter
+              // so that we're sure we're not relying on either of them. jQuery UI patch
+              // behaves in this way.
+              currentCleanData(elems);
+            };
 
-              runTest();
+            runTest();
 
-              // The initial ng-repeat div is dumped after parsing hence we expect cleanData
-              // count to be one larger than size of the iterated array.
-              expect(cleanedCount).toBe(is.length + 1);
+            // The initial ng-repeat div is dumped after parsing hence we expect cleanData
+            // count to be one larger than size of the iterated array.
+            expect(cleanedCount).toBe(is.length + 1);
 
-              // Restore the previous cleanData.
-              jqLite.cleanData = currentCleanData;
-            });
-          }
+            // Restore the previous cleanData.
+            jqLite.cleanData = currentCleanData;
+          });
         });
 
         describe('replace and not exactly one root element', function() {
@@ -8640,28 +8638,26 @@ describe('$compile', function() {
 
         it('should work without external libraries (except jQuery)', testCleanup);
 
-        if (jQuery) {
-          it('should work with another library patching jQuery.cleanData after AngularJS', function() {
-            var cleanedCount = 0;
-            var currentCleanData = jqLite.cleanData;
-            jqLite.cleanData = function(elems) {
-              cleanedCount += elems.length;
-              // Don't return the output and explicitly pass only the first parameter
-              // so that we're sure we're not relying on either of them. jQuery UI patch
-              // behaves in this way.
-              currentCleanData(elems);
-            };
+        it('should work with another library patching jqLite/jQuery.cleanData after AngularJS', function() {
+          var cleanedCount = 0;
+          var currentCleanData = jqLite.cleanData;
+          jqLite.cleanData = function(elems) {
+            cleanedCount += elems.length;
+            // Don't return the output and explicitly pass only the first parameter
+            // so that we're sure we're not relying on either of them. jQuery UI patch
+            // behaves in this way.
+            currentCleanData(elems);
+          };
 
-            testCleanup();
+          testCleanup();
 
-            // The ng-repeat template is removed/cleaned (the +1)
-            // and each clone of the ng-repeat template is also removed (xs.length)
-            expect(cleanedCount).toBe(xs.length + 1);
+          // The ng-repeat template is removed/cleaned (the +1)
+          // and each clone of the ng-repeat template is also removed (xs.length)
+          expect(cleanedCount).toBe(xs.length + 1);
 
-            // Restore the previous cleanData.
-            jqLite.cleanData = currentCleanData;
-          });
-        }
+          // Restore the previous cleanData.
+          jqLite.cleanData = currentCleanData;
+        });
       });
 
 

yarn.lock

@@ -3508,9 +3508,9 @@ jodid25519@^1.0.0:
   dependencies:
     jsbn "~0.1.0"
 
-jquery@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.1.1.tgz#347c1c21c7e004115e0a4da32cece041fad3c8a3"
+jquery@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
 
 js-tokens@^3.0.0:
   version "3.0.1"