add $defer.flush('$burp') to the scope life-cycle

IgorMinar · IgorMinar · commit 9db62d681dd8 · 2011-05-28T03:20:45.000-07:00
diff --git a/src/Scope.js b/src/Scope.js
@@ -101,7 +101,8 @@ function createScope(providers, instanceCache) {
  *       {@link angular.service.$exceptionHandler $exceptionHandler} service.
  *    3. The {@link angular.scope.$watch watch} listeners are fired immediately after
  *       the expression was executed using the {@link angular.scope.$digest $digest()} method.
- *    4. Finally the update of the DOM is scheduled using the
+ *    4. The `{@link angular.service.$defer $burp queue} with deferred tasks is flushed.
+ *    5. Finally the update of the DOM is scheduled using the
  *       {@link angular.service.$updateView $updateView} service (see step #6) The `$updateView`
  *       may merge multiple requests, that are close time-wise, into a single update.
  * 6. The {@link angular.service.$updateView $updateView} service then fires DOM
@@ -842,6 +843,7 @@ Scope.prototype = {
           $exceptionHandler(e);
         } finally {
           $root.$digest();
+          $defer.flush('$burp');
           $updateView();
         }
       }
@@ -860,6 +862,7 @@ Scope.prototype = {
       this.$service('$exceptionHandler')(e);
     } finally {
       this.$root.$digest();
+      this.$service('$defer').flush('$burp');
       this.$service('$updateView')();
     }
   }
diff --git a/test/ScopeSpec.js b/test/ScopeSpec.js
@@ -439,9 +439,10 @@ describe('Scope', function(){
       var log = '';
       var child = root.$new();
       root.$watch('a', function(scope, a){ log += '1'; });
-      root.$observe('a', function(scope, a){ log += '2'; });
+      root.$observe('a', function(scope, a){ log += '3'; });
+      root.$service('$defer')('$burp', function() { log += '2'; });
       child.$apply('$parent.a=0');
-      expect(log).toEqual('12');
+      expect(log).toEqual('123');
     });
 
 
@@ -464,8 +465,11 @@ describe('Scope', function(){
         log = '';
         $exceptionHandler = jasmine.createSpy('$exceptionHandler');
         $updateView = jasmine.createSpy('$updateView');
+        $defer = {flush: jasmine.createSpy('$defer.flush')};
         root.$service = function(name) {
-          return {$updateView:$updateView, $exceptionHandler:$exceptionHandler}[name];
+          return {$updateView:$updateView,
+                  $exceptionHandler:$exceptionHandler,
+                  $defer:$defer}[name];
         };
         root.$watch(function(){ log += '$digest;'; });
         log = '';

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ function createScope(providers, instanceCache) {`
`101`	`101`	`* {@link angular.service.$exceptionHandler $exceptionHandler} service.`
`102`	`102`	`* 3. The {@link angular.scope.$watch watch} listeners are fired immediately after`
`103`	`103`	`* the expression was executed using the {@link angular.scope.$digest $digest()} method.`
`104`		`- * 4. Finally the update of the DOM is scheduled using the`
	`104`	+ * 4. The `{@link angular.service.$defer $burp queue} with deferred tasks is flushed.
	`105`	`+ * 5. Finally the update of the DOM is scheduled using the`
`105`	`106`	* {@link angular.service.$updateView $updateView} service (see step #6) The `$updateView`
`106`	`107`	`* may merge multiple requests, that are close time-wise, into a single update.`
`107`	`108`	`* 6. The {@link angular.service.$updateView $updateView} service then fires DOM`
`@@ -842,6 +843,7 @@ Scope.prototype = {`
`842`	`843`	`$exceptionHandler(e);`
`843`	`844`	`} finally {`
`844`	`845`	`$root.$digest();`
	`846`	`+ $defer.flush('$burp');`
`845`	`847`	`$updateView();`
`846`	`848`	`}`
`847`	`849`	`}`
`@@ -860,6 +862,7 @@ Scope.prototype = {`
`860`	`862`	`this.$service('$exceptionHandler')(e);`
`861`	`863`	`} finally {`
`862`	`864`	`this.$root.$digest();`
	`865`	`+ this.$service('$defer').flush('$burp');`
`863`	`866`	`this.$service('$updateView')();`
`864`	`867`	`}`
`865`	`868`	`}`