Merge branch 'master' of https://github.com/angular/angular.js

Author: gkalpak

docs/content/error/$http/badjsonp.ngdoc

@@ -9,7 +9,7 @@ value is `JSON_CALLBACK`.
 
 `$http` JSONP requests need to attach a callback query parameter to the URL. The name of this
 parameter is specified in the configuration object (or in the defaults) via the `jsonpCallbackParam`
-property. You must not provide your own parameter with this name in the configuratio of the request.
+property. You must not provide your own parameter with this name in the configuration of the request.
 
 In previous versions of AngularJS, you specified where to add the callback parameter value via the
 `JSON_CALLBACK` placeholder. This is no longer allowed.

package.json

@@ -56,18 +56,18 @@
     "gulp-sourcemaps": "^1.2.2",
     "gulp-uglify": "^1.0.1",
     "gulp-util": "^3.0.1",
-    "jasmine-core": "^2.4.0",
+    "jasmine-core": "2.5.2",
     "jasmine-node": "^2.0.0",
     "jasmine-reporters": "^2.2.0",
     "jquery": "^3.2.1",
-    "karma": "^1.1.2",
-    "karma-browserstack-launcher": "^1.0.1",
-    "karma-chrome-launcher": "^1.0.1",
-    "karma-firefox-launcher": "^1.0.0",
-    "karma-jasmine": "^1.0.2",
-    "karma-junit-reporter": "^1.1.0",
+    "karma": "^1.7.0",
+    "karma-browserstack-launcher": "^1.2.0",
+    "karma-chrome-launcher": "^2.1.1",
+    "karma-firefox-launcher": "^1.0.1",
+    "karma-jasmine": "^1.1.0",
+    "karma-junit-reporter": "^1.2.0",
     "karma-ng-scenario": "^1.0.0",
-    "karma-sauce-launcher": "^1.0.0",
+    "karma-sauce-launcher": "^1.1.0",
     "karma-script-launcher": "^1.0.0",
     "load-grunt-tasks": "^3.5.0",
     "lodash": "~2.4.1",

src/ng/http.js

@@ -110,7 +110,6 @@ function $HttpParamSerializerJQLikeProvider() {
       return parts.join('&');
 
       function serialize(toSerialize, prefix, topLevel) {
-        if (toSerialize === null || isUndefined(toSerialize)) return;
         if (isArray(toSerialize)) {
           forEach(toSerialize, function(value, index) {
             serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
@@ -123,7 +122,8 @@ function $HttpParamSerializerJQLikeProvider() {
                 (topLevel ? '' : ']'));
           });
         } else {
-          parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+          parts.push(encodeUriQuery(prefix) + '=' +
+              (toSerialize == null ? '' : encodeUriQuery(serializeValue(toSerialize))));
         }
       }
     };

test/.eslintrc.json

@@ -176,6 +176,7 @@
     "browserSupportsCssAnimations": false,
     "browserTrigger": false,
     "jqLiteCacheSize": false,
-    "createAsync": false
+    "createAsync": false,
+    "support": false
   }
 }

test/auto/injectorSpec.js

@@ -1,7 +1,5 @@
 'use strict';
 
-/* globals support: false */
-
 describe('injector.modules', function() {
     it('should expose the loaded module info on the instance injector', function() {
       var test1 = angular.module('test1', ['test2']).info({ version: '1.1' });
@@ -327,26 +325,24 @@ describe('injector', function() {
           expect(instance.aVal()).toEqual('a-value');
         });
 
-        if (/chrome/.test(window.navigator.userAgent)) {
-          they('should detect ES6 classes regardless of whitespace/comments ($prop)', [
-            'class Test {}',
-            'class Test{}',
-            'class //<--ES6 stuff\nTest {}',
-            'class//<--ES6 stuff\nTest {}',
-            'class {}',
-            'class{}',
-            'class //<--ES6 stuff\n {}',
-            'class//<--ES6 stuff\n {}',
-            'class/* Test */{}',
-            'class /* Test */ {}'
-          ], function(classDefinition) {
-            // eslint-disable-next-line no-eval
-            var Clazz = eval('(' + classDefinition + ')');
-            var instance = injector.invoke(Clazz);
-
-            expect(instance).toEqual(jasmine.any(Clazz));
-          });
-        }
+        they('should detect ES6 classes regardless of whitespace/comments ($prop)', [
+          'class Test {}',
+          'class Test{}',
+          'class //<--ES6 stuff\nTest {}',
+          'class//<--ES6 stuff\nTest {}',
+          'class {}',
+          'class{}',
+          'class //<--ES6 stuff\n {}',
+          'class//<--ES6 stuff\n {}',
+          'class/* Test */{}',
+          'class /* Test */ {}'
+        ], function(classDefinition) {
+          // eslint-disable-next-line no-eval
+          var Clazz = eval('(' + classDefinition + ')');
+          var instance = injector.invoke(Clazz);
+
+          expect(instance).toEqual(jasmine.any(Clazz));
+        });
       }
     });
 

test/helpers/testabilityPatch.js

@@ -4,7 +4,7 @@
 if (window.bindJQuery) bindJQuery();
 
 var supportTests = {
-  classes: '(class {})',
+  classes: '/^class\\b/.test((class C {}).toString())',
   fatArrow: 'a => a',
   ES6Function: '({ fn(x) { return; } })'
 };
@@ -15,8 +15,7 @@ for (var prop in supportTests) {
   if (supportTests.hasOwnProperty(prop)) {
     try {
       // eslint-disable-next-line no-eval
-      eval(supportTests[prop]);
-      support[prop] = true;
+      support[prop] = !!eval(supportTests[prop]);
     } catch (e) {
       support[prop] = false;
     }

test/ng/compileSpec.js

@@ -6175,10 +6175,10 @@ describe('$compile', function() {
     });
 
     it('should eventually expose isolate scope variables on ES6 class controller with controllerAs when bindToController is true', function() {
-      if (!/chrome/i.test(window.navigator.userAgent)) return;
+      if (!support.classes) return;
       var controllerCalled = false;
       // eslint-disable-next-line no-eval
-      var Controller = eval(
+      var Controller = eval('(\n' +
         'class Foo {\n' +
         '  constructor($scope) {}\n' +
         '  $onInit() {\n' +
@@ -6194,7 +6194,8 @@ describe('$compile', function() {
         '    expect(this.fn()).toBe(\'called!\');\n' +
         '    controllerCalled = true;\n' +
         '  }\n' +
-        '}');
+        '}\n' +
+        ')');
       spyOn(Controller.prototype, '$onInit').and.callThrough();
 
       module(function($compileProvider) {

test/ng/httpSpec.js

@@ -2306,5 +2306,11 @@ describe('$http param serializers', function() {
          'a%5B%5D=b&a%5B%5D=c&d%5B0%5D%5Be%5D=f&d%5B0%5D%5Bg%5D=h&d%5B%5D=i&d%5B2%5D%5Bj%5D=k');
          //a[]=b&a[]=c&d[0][e]=f&d[0][g]=h&d[]=i&d[2][j]=k
     });
+
+    it('should serialize `null` and `undefined` elements as empty', function() {
+      expect(jqrSer({items:['foo', 'bar', null, undefined, 'baz'], x: null, y: undefined})).toEqual(
+         'items%5B%5D=foo&items%5B%5D=bar&items%5B%5D=&items%5B%5D=&items%5B%5D=baz&x=&y=');
+         //items[]=foo&items[]=bar&items[]=&items[]=&items[]=baz&x=&y=
+    });
   });
 });