SQUASH ME: feat($http): specify the JSONP callback via the jsonpCallbackParam config value

Author: petebacondarwin

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

@@ -3,16 +3,16 @@
 @fullName Bad JSONP Request Configuration
 @description
 
-This error occurs when the URL generated from the configuration object contains a parameter with the same name as the configured `callbackParam`
+This error occurs when the URL generated from the configuration object contains a parameter with the same name as the configured `jsonpCallbackParam`
 property; or when it contains a parameter whose value is `JSON_CALLBACK`.
 
 `$http` JSON 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 `callbackParam` property. You must not provide your own parameter with this name in the configuration
+object (or in the defaults) via the `jsonpCallbackParam` property. You must not provide your own parameter with this name in the configuration
 of the request.
 
 In previous versions of Angular, you specified where to add the callback parameter value via the `JSON_CALLBACK` placeholder. This is no longer
 allowed.
 
-To resolve this error, remove any parameters that have the same name as the `callbackParam`; and/or remove any parameters that have a value of `JSON_CALLBACK`.
+To resolve this error, remove any parameters that have the same name as the `jsonpCallbackParam`; and/or remove any parameters that have a value of `JSON_CALLBACK`.
 
 For more information, see the {@link ng.$http#jsonp `$http.jsonp()`} method API documentation.

src/ng/http.js

@@ -286,7 +286,7 @@ function $HttpProvider() {
    *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
    *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
    *
-   * - **`defaults.callbackParam`** - `{string} - the name of the query parameter that passes the callback in a JSONP
+   * - **`defaults.jsonpCallbackParam`** - `{string} - the name of the query parameter that passes the callback in a JSONP
    * request. The value of this parameter will be replaced with the expression generated by the {@link jsonpCallbacks}
    * service. Defaults to `'callback'`.
    *
@@ -315,7 +315,7 @@ function $HttpProvider() {
 
     paramSerializer: '$httpParamSerializer',
 
-    callbackParam: 'callback'
+    jsonpCallbackParam: 'callback'
   };
 
   var useApplyAsync = false;
@@ -971,7 +971,7 @@ function $HttpProvider() {
         transformRequest: defaults.transformRequest,
         transformResponse: defaults.transformResponse,
         paramSerializer: defaults.paramSerializer,
-        callbackParam: defaults.callbackParam
+        jsonpCallbackParam: defaults.jsonpCallbackParam
       }, requestConfig);
 
       config.headers = mergeHeaders(requestConfig);
@@ -1177,13 +1177,13 @@ function $HttpProvider() {
      *
      * JSONP requests must specify a callback to be used in the response from the server. This callback
      * is passed as as a query parameter in the request. You must specify the name of this parameter by
-     * setting the `callbackParam` property on the request config object.
+     * setting the `jsonpCallbackParam` property on the request config object.
      *
      * ```
-     * $http.jsonp('some/trusted/url', {callbackParam: 'callback'})
+     * $http.jsonp('some/trusted/url', {jsonpCallbackParam: 'callback'})
      * ```
      *
-     * You can also specify a global callback parameter key in `$http.defaults.callbackParam`.
+     * You can also specify a global callback parameter key in `$http.defaults.jsonpCallbackParam`.
      * By default this is set to `callback`.
      *
      * <div class="alert alert-danger">
@@ -1310,7 +1310,7 @@ function $HttpProvider() {
 
       if (isJsonp) {
         // Check the url and add the JSONP callback placeholder
-        url = sanitizeJsonpCallbackParam(url, config.callbackParam);
+        url = sanitizeJsonpCallbackParam(url, config.jsonpCallbackParam);
       }
 
       $http.pendingRequests.push(config);

test/ng/httpSpec.js

@@ -1091,15 +1091,15 @@ describe('$http', function() {
         expect(error.message).toContain('[$http:badjsonp]');
       });
 
-      it('should error if there is already a param matching the callbackParam key', function() {
+      it('should error if there is already a param matching the jsonpCallbackParam key', function() {
         var error;
         $http({ method: 'JSONP', url: $sce.trustAsResourceUrl('http://example.org/path'), params: {callback: 'evilThing'}})
             .catch(function(e) { error = e; });
         $rootScope.$digest();
         expect(error.message).toContain('[$http:badjsonp]');
 
         error = undefined;
-        $http({ method: 'JSONP', callbackParam: 'cb', url: $sce.trustAsResourceUrl('http://example.org/path'), params: {cb: 'evilThing'}})
+        $http({ method: 'JSONP', jsonpCallbackParam: 'cb', url: $sce.trustAsResourceUrl('http://example.org/path'), params: {cb: 'evilThing'}})
             .catch(function(e) { error = e; });
         $rootScope.$digest();
         expect(error.message).toContain('[$http:badjsonp]');