fixup! fix($location): avoid unnecessary $locationChange* events due to empty hash

Author: gkalpak

src/ng/browser.js

@@ -1,11 +1,15 @@
 'use strict';
-/* global getHash: true, stripHash: false, trimEmptyHash: false */
+/* global getHash: true, stripHash: false, trimEmptyHash: true */
 
 function getHash(url) {
   var index = url.indexOf('#');
   return index === -1 ? '' : url.substr(index);
 }
 
+function trimEmptyHash(url) {
+  return url.replace(/#$/, '');
+}
+
 /**
  * ! This is a private undocumented service !
  *
@@ -143,7 +147,7 @@ function Browser(window, document, $log, $sniffer, $$taskTrackerFactory) {
       // - pendingLocation is needed as browsers don't allow to read out
       //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
       //   https://openradar.appspot.com/22186109).
-      return pendingLocation || trimEmptyHash(location.href);
+      return trimEmptyHash(pendingLocation || location.href);
     }
   };
 

src/ng/location.js

@@ -1,5 +1,5 @@
 'use strict';
-/* global stripHash: true, trimEmptyHash: true */
+/* global stripHash: true */
 
 var PATH_MATCH = /^([^?#]*)(\?([^#]*))?(#(.*))?$/,
     DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
@@ -95,17 +95,11 @@ function stripBaseUrl(base, url) {
   }
 }
 
-
 function stripHash(url) {
   var index = url.indexOf('#');
   return index === -1 ? url : url.substr(0, index);
 }
 
-function trimEmptyHash(url) {
-  return url.replace(/#$/, '');
-}
-
-
 function stripFile(url) {
   return url.substr(0, stripHash(url).lastIndexOf('/') + 1);
 }
@@ -944,7 +938,7 @@ function $LocationProvider() {
 
 
     // rewrite hashbang url <> html5 url
-    if (trimEmptyHash($location.absUrl()) !== trimEmptyHash(initialUrl)) {
+    if ($location.absUrl() !== initialUrl) {
       $browser.url($location.absUrl(), true);
     }
 
@@ -963,7 +957,6 @@ function $LocationProvider() {
         var oldUrl = $location.absUrl();
         var oldState = $location.$$state;
         var defaultPrevented;
-        newUrl = trimEmptyHash(newUrl);
         $location.$$parse(newUrl);
         $location.$$state = newState;
 
@@ -991,8 +984,8 @@ function $LocationProvider() {
       if (initializing || $location.$$urlUpdatedByLocation) {
         $location.$$urlUpdatedByLocation = false;
 
-        var oldUrl = trimEmptyHash($browser.url());
-        var newUrl = trimEmptyHash($location.absUrl());
+        var oldUrl = $browser.url();
+        var newUrl = $location.absUrl();
         var oldState = $browser.state();
         var currentReplace = $location.$$replace;
         var urlOrStateChanged = !urlsEqual(oldUrl, newUrl) ||

src/ngMock/angular-mocks.js

@@ -1,6 +1,6 @@
 'use strict';
 
-/* global routeToRegExp: false */
+/* global routeToRegExp: false, trimEmptyHash: false */
 
 /**
  * @ngdoc object
@@ -225,7 +225,7 @@ angular.mock.$Browser.prototype = {
       state = null;
     }
     if (url) {
-      this.$$url = url;
+      this.$$url = trimEmptyHash(url);
       // Native pushState serializes & copies the object; simulate it.
       this.$$state = angular.copy(state);
       return this;