From 2d61040fb085f5d3a226d39726e105c1e6bd7006 Mon Sep 17 00:00:00 2001
From: Vojta Jina
Date: Sun, 31 Oct 2010 02:14:55 +0200
Subject: Small refactor in $location service

Added new inner method updateLastLocation()
---
 src/services.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/services.js b/src/services.js
index fca4bca1..9af69403 100644
--- a/src/services.js
+++ b/src/services.js
@@ -23,8 +23,7 @@ angularServiceInject("$location", function(browser) {
   browser.addPollFn(function() {
     if (lastBrowserUrl != browser.getUrl()) {
       update(lastBrowserUrl = browser.getUrl());
-      lastLocationHref = location.href;
-      lastLocationHash = location.hash;
+      updateLastLocation();
       scope.$eval();
     }
   });
@@ -33,8 +32,7 @@ angularServiceInject("$location", function(browser) {
   this.$onEval(PRIORITY_LAST, updateBrowser);
 
   update(lastBrowserUrl);
-  lastLocationHref = location.href;
-  lastLocationHash = location.hash;
+  updateLastLocation();
 
   return location;
 
@@ -134,6 +132,14 @@ angularServiceInject("$location", function(browser) {
     update(location.href);
   }
 
+  /**
+   * Update information about last location
+   */
+  function updateLastLocation() {
+    lastLocationHref = location.href;
+    lastLocationHash = location.hash;
+  }
+
   /**
    * If location has changed, update the browser
    * This method is called at the end of $eval() phase
@@ -143,8 +149,7 @@ angularServiceInject("$location", function(browser) {
 
     if (location.href != lastLocationHref) {    	
       browser.setUrl(lastBrowserUrl = location.href);
-      lastLocationHref = location.href;
-      lastLocationHash = location.hash;
+      updateLastLocation();
     }
   }
 
-- 
cgit v1.2.3