SQUASH ME (AGAIN)

Author: petebacondarwin

src/ng/compile.js

@@ -1241,7 +1241,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
    * Increasing the TTL could have performance implications, so you should not change it without proper justification.
    *
    * @param {number} limit The number of `$onChanges` hook iterations.
-   * @returns {number|object} the current limit (or `this` if called as a setting for chaining)
+   * @returns {number|object} the current limit (or `this` if called as a setter for chaining)
    */
   this.onChangesTtl = function(value) {
     if (arguments.length) {
@@ -1269,19 +1269,23 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
     // This function is called in a $$postDigest to trigger all the onChanges hooks in a single digest
     function flushOnChangesQueue() {
-      if (!(onChangesTtl--)) {
-        onChangesTtl = TTL;
-        throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL);
-      }
-      // We must run this hook in an apply since the $$postDigest runs outside apply
-      $rootScope.$apply(function() {
-        for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
-          onChangesQueue[i]();
+      try {
+        if (!(--onChangesTtl)) {
+          // We have hit the TTL limit so reset everything
+          onChangesQueue = undefined;
+          throw $compileMinErr('infchng', '{0} $onChanges() iterations reached. Aborting!\n', TTL);
         }
-        // Reset the queue to trigger a new schedule next time there is a change
-        onChangesQueue = undefined;
-      });
-      onChangesTtl++;
+        // We must run this hook in an apply since the $$postDigest runs outside apply
+        $rootScope.$apply(function() {
+          for (var i = 0, ii = onChangesQueue.length; i < ii; ++i) {
+            onChangesQueue[i]();
+          }
+          // Reset the queue to trigger a new schedule next time there is a change
+          onChangesQueue = undefined;
+        });
+      } finally {
+        onChangesTtl++;
+      }
     }
 
 
@@ -3194,7 +3198,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         if (isFunction(destination.$onChanges) && currentValue !== previousValue) {
           // If we have not already scheduled the top level onChangesQueue handler then do so now
           if (!onChangesQueue) {
-            // Initialize the TTL tracker for tracking stack overflow
             scope.$$postDigest(flushOnChangesQueue);
             onChangesQueue = [];
           }

test/ng/compileSpec.js

@@ -3838,7 +3838,7 @@ describe('$compile', function() {
       });
 
 
-      it('should throw a RangeError if `$onChanges()` hooks are not stable', function() {
+      it('should throw an error if `$onChanges()` hooks are not stable', function() {
         function TestController() {}
         TestController.prototype.$onChanges = function(change) {
           this.onChange();
@@ -3856,11 +3856,50 @@ describe('$compile', function() {
           // Setup the directive with bindings that will keep updating the bound value forever
           element = $compile('<c1 prop="a" on-change="a = -a"></c1>')($rootScope);
 
-          // Update val to trigger the unstable onChanges, which will result in a
-          // Range error - maximum call stack size exceeded
+          // Update val to trigger the unstable onChanges, which will result in an error
           expect(function() {
             $rootScope.$apply('a = 42');
           }).toThrowMinErr('$compile', 'infchng');
+
+          dealoc(element);
+          element = $compile('<c1 prop="b" on-change=""></c1>')($rootScope);
+          $rootScope.$apply('b = 24');
+          $rootScope.$apply('b = 48');
+        });
+      });
+
+
+      it('should log an error if `$onChanges()` hooks are not stable', function() {
+        function TestController() {}
+        TestController.prototype.$onChanges = function(change) {
+          this.onChange();
+        };
+
+        angular.module('my', [])
+          .component('c1', {
+            controller: TestController,
+            bindings: {'prop': '<', onChange: '&'}
+          })
+          .config(function($exceptionHandlerProvider) {
+            // We need to test with the exceptionHandler not rethrowing...
+            $exceptionHandlerProvider.mode('log');
+          });
+
+        module('my');
+        inject(function($compile, $rootScope, $exceptionHandler) {
+
+          // Setup the directive with bindings that will keep updating the bound value forever
+          element = $compile('<c1 prop="a" on-change="a = -a"></c1>')($rootScope);
+
+          // Update val to trigger the unstable onChanges, which will result in an error
+          $rootScope.$apply('a = 42');
+
+          dealoc(element);
+          element = $compile('<c1 prop="b" on-change=""></c1>')($rootScope);
+          $rootScope.$apply('b = 24');
+          $rootScope.$apply('b = 48');
+
+          expect($exceptionHandler.errors[0].toString()).toContain('[$compile:infchng] 10 $onChanges() iterations reached.');
         });
       });
     });