push $location state to $browser in the $burp phase

IgorMinar · IgorMinar · commit 26c165f4b6aa · 2011-05-28T03:20:49.000-07:00
instead of $digest
diff --git a/src/service/location.js b/src/service/location.js
@@ -66,9 +66,10 @@ var URL_MATCH = /^(file|ftp|http|https):\/\/(\w+:{0,1}\w*@)?([\w\.-]*)(:([0-9]+)
      </doc:scenario>
     </doc:example>
  */
-angularServiceInject("$location", function($browser) {
+angularServiceInject("$location", function($browser, $defer) {
   var location = {update: update, updateHash: updateHash};
   var lastLocation = {}; // last state since last update().
+  var deferId;
 
   $browser.onHashChange(bind(this, this.$apply, function() { //register
     update($browser.getUrl());
@@ -118,8 +119,10 @@ angularServiceInject("$location", function($browser) {
 
       location.href = composeHref(location);
     }
-    $browser.setUrl(location.href);
     copy(location, lastLocation);
+
+    $defer.cancel(deferId);
+    deferId = $defer('$burp', function() { $browser.setUrl(location.href); });
   }
 
   /**
@@ -270,4 +273,4 @@ angularServiceInject("$location", function($browser) {
 
     return h;
   }
-}, ['$browser']);
+}, ['$browser', '$defer']);
diff --git a/test/service/locationSpec.js b/test/service/locationSpec.js
@@ -39,14 +39,20 @@ describe('$location', function() {
   });
 
 
-  it('should update browser at the end of $eval', function() {
+  it('should update browser at the end of $apply', function() {
     var origBrowserUrl = $browser.getUrl();
     $location.update('http://www.angularjs.org/');
     $location.update({path: '/a/b'});
     expect($location.href).toEqual('http://www.angularjs.org/a/b');
-    expect($browser.getUrl()).toEqual('http://www.angularjs.org/a/b');
+    expect($browser.getUrl()).toEqual('http://server');
     $location.path = '/c';
+
+    //don't flush stuff to the browser
     scope.$digest();
+    expect($browser.getUrl()).toEqual('http://server');
+
+    //flush stuff to the browser
+    scope.$service('$defer').flush('$burp');
     expect($browser.getUrl()).toEqual('http://www.angularjs.org/c');
   });
 
