Added invokeApply parameter to $http to skip apply (pr angular#12557)

Author: Alexey Kuznetsov

package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/angular/angular.js.git"
   },
   "engines": {
-    "node": "^8.9.1",
+    "node": ">8.9.1",
     "yarn": ">=1.3.2",
     "grunt": "^1.2.0"
   },

src/ng/http.js

@@ -1031,7 +1031,7 @@ function $HttpProvider() {
 </file>
 </example>
      */
-    function $http(requestConfig) {
+    function $http(requestConfig, invokeApply) {
 
       if (!isObject(requestConfig)) {
         throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
@@ -1155,7 +1155,7 @@ function $HttpProvider() {
         }
 
         // send request
-        return sendReq(config, reqData).then(transformResponse, transformResponse);
+        return sendReq(config, reqData, invokeApply).then(transformResponse, transformResponse);
       }
 
       function transformResponse(response) {
@@ -1318,7 +1318,7 @@ function $HttpProvider() {
 
     function createShortMethods(names) {
       forEach(arguments, function(name) {
-        $http[name] = function(url, config) {
+          $http[name] = function(url, config, invokeApply) {
           return $http(extend({}, config || {}, {
             method: name,
             url: url
@@ -1330,7 +1330,7 @@ function $HttpProvider() {
 
     function createShortMethodsWithData(name) {
       forEach(arguments, function(name) {
-        $http[name] = function(url, data, config) {
+          $http[name] = function(url, data, config, invokeApply) {
           return $http(extend({}, config || {}, {
             method: name,
             url: url,
@@ -1347,7 +1347,7 @@ function $HttpProvider() {
      * !!! ACCESSES CLOSURE VARS:
      * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
      */
-    function sendReq(config, reqData) {
+    function sendReq(config, reqData, invokeApply) {
       var deferred = $q.defer(),
           promise = deferred.promise,
           cache,
@@ -1465,11 +1465,16 @@ function $HttpProvider() {
           resolvePromise(response, status, headersString, statusText, xhrStatus);
         }
 
-        if (useApplyAsync) {
-          $rootScope.$applyAsync(resolveHttpPromise);
+        var skipApply = (isDefined(invokeApply) && !invokeApply);
+        if (!skipApply) {
+          if (useApplyAsync) {
+            $rootScope.$applyAsync(resolveHttpPromise);
+          } else {
+            resolveHttpPromise();
+            if (!$rootScope.$$phase) $rootScope.$apply();
+          }
         } else {
           resolveHttpPromise();
-          if (!$rootScope.$$phase) $rootScope.$apply();
         }
       }
 

test/ng/httpSpec.js

@@ -1017,6 +1017,7 @@ describe('$http', function() {
 
     describe('callbacks', function() {
 
+
       it('should $apply after success callback', function() {
         $httpBackend.when('GET').respond(200);
         $http({method: 'GET', url: '/some'});
@@ -1071,6 +1072,44 @@ describe('$http', function() {
         expect(uploadProgressFn).toHaveBeenCalledOnceWith(eventObj);
         expect($rootScope.$digest).toHaveBeenCalledTimes(2);
       });
+
+      it('should resolve promises anyway', function() {
+          $httpBackend.when('GET').respond(200);
+          var promiseCompleted = false;
+          $http({method: 'GET', url: '/some'}, false).then(function() {
+            promiseCompleted = true;
+          });
+          $httpBackend.flush();
+          expect(promiseCompleted).toBe(true);
+      });
+
+      describe('when invokeApply is defined and falsy', function() {
+          it('should not $apply after success callback', function() {
+              $httpBackend.when('GET').respond(200);
+              $http({method: 'GET', url: '/some'}, false);
+              $httpBackend.flush();
+              expect($rootScope.$apply).not.toHaveBeenCalledOnce();
+          });
+
+
+          it('should not $apply after error callback', function() {
+              $httpBackend.when('GET').respond(404);
+              $http({method: 'GET', url: '/some'}, false).catch(noop);
+              $httpBackend.flush();
+              expect($rootScope.$apply).not.toHaveBeenCalledOnce();
+          });
+
+          it('should not $apply if exception thrown during callback', inject(function($exceptionHandler) {
+              $httpBackend.when('GET').respond(200);
+              callback.and.throwError('error in callback');
+
+              $http({method: 'GET', url: '/some'}, false).then(callback);
+              $httpBackend.flush();
+              expect($rootScope.$apply).not.toHaveBeenCalledOnce();
+
+              $exceptionHandler.errors = [];
+          }));
+      });
     });