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

Author: petebacondarwin

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

@@ -6,7 +6,7 @@
 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
+`$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 configuration
 of the request.
 

src/ng/http.js

@@ -287,7 +287,7 @@ function $HttpProvider() {
    *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
    *
    * - **`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}
+   * request. The value of this parameter will be replaced with the expression generated by the {@link $jsonpCallbacks}
    * service. Defaults to `'callback'`.
    *
    **/
@@ -1169,22 +1169,22 @@ function $HttpProvider() {
      * @description
      * Shortcut method to perform `JSONP` request.
      *
-     * Note that, since JSONP requests are sensitive because the response is given full acces to the browser,
+     * Note that, since JSONP requests are sensitive because the response is given full access to the browser,
      * the url must be declared, via {@link $sce} as a trusted resource URL.
      * You can trust a URL by adding it to the whitelist via
      * {@link $sceDelegateProvider#resourceUrlWhitelist  `$sceDelegateProvider.resourceUrlWhitelist`} or
-     * by explicitly trusted the URL via {@link $sce#trustAsResourceUrl `$sce.trustAsResourceUrl(url)`}.
+     * by explicitly trusting the URL via {@link $sce#trustAsResourceUrl `$sce.trustAsResourceUrl(url)`}.
      *
      * 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
+     * is passed as a query parameter in the request. You must specify the name of this parameter by
      * setting the `jsonpCallbackParam` property on the request config object.
      *
      * ```
      * $http.jsonp('some/trusted/url', {jsonpCallbackParam: 'callback'})
      * ```
      *
      * You can also specify a global callback parameter key in `$http.defaults.jsonpCallbackParam`.
-     * By default this is set to `callback`.
+     * By default this is set to `'callback'`.
      *
      * <div class="alert alert-danger">
      * You can no longer use the `JSON_CALLBACK` string as a placeholder for specifying where the callback
@@ -1454,7 +1454,7 @@ function $HttpProvider() {
         throw $httpMinErr('badjsonp', 'Illegal use of JSON_CALLBACK in url, "{0}"', url);
       }
 
-      var callbackParamRegex = new RegExp('([&?]' + key + '=)');
+      var callbackParamRegex = new RegExp('[&?]' + key + '=');
       if (callbackParamRegex.test(url)) {
         // Throw if the callback param was already provided
         throw $httpMinErr('badjsonp', 'Illegal use of callback param, "{0}", in url, "{1}"', key, url);

test/ng/httpSpec.js

@@ -326,10 +326,8 @@ describe('$http', function() {
     });
 
     it('should accept a $sce trusted object for the request configuration url', function() {
-      expect(function() {
-        $httpBackend.expect('GET', '/url').respond('');
-        $http({url: $sce.trustAsResourceUrl('/url')});
-      }).not.toThrowMinErr('$http','badreq', 'Http request configuration url must be a string.  Received: false');
+      $httpBackend.expect('GET', '/url').respond('');
+      $http({url: $sce.trustAsResourceUrl('/url')});
     });
 
     it('should send GET requests if no method specified', function() {