refactor($location): merged $locationConfig service into $locationProvider

2 files changed, 24 insertions, 15 deletions

diff --git a/src/Angular.js b/src/Angular.js
index bb75bc4e..69a5e4ca 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -954,7 +954,6 @@ function ngModule($provide, $injector) {
   $provide.service('$filter', $FilterProvider);
   $provide.service('$formFactory', $FormFactoryProvider);
   $provide.service('$location', $LocationProvider);
-  $provide.service('$locationConfig', $LocationConfigProvider);
   $provide.service('$log', $LogProvider);
   $provide.service('$parse', $ParseProvider);
   $provide.service('$resource', $ResourceProvider);
diff --git a/src/service/location.js b/src/service/location.js
index 7cc5c273..11a69e96 100644
--- a/src/service/location.js
+++ b/src/service/location.js
@@ -420,15 +420,35 @@ function locationGetterSetter(property, preprocess) {
  * For more information see {@link guide/dev_guide.services.$location Developer Guide: Angular Services: Using $location}
  */
 function $LocationProvider(){
-  this.$get = ['$rootScope', '$browser', '$sniffer', '$locationConfig', '$document',
-      function( $rootScope,   $browser,   $sniffer,   $locationConfig,   $document) {
+  var hashPrefix = '',
+      html5Mode = false;
+
+  this.hashPrefix = function(prefix) {
+    if (isDefined(prefix)) {
+      hashPrefix = prefix;
+      return this;
+    } else {
+      return html5Mode;
+    }
+  }
+
+  this.html5Mode = function(mode) {
+    if (isDefined(mode)) {
+      html5Mode = mode;
+      return this;
+    } else {
+      return html5Mode;
+    }
+  };
+
+  this.$get = ['$rootScope', '$browser', '$sniffer', '$document',
+      function( $rootScope,   $browser,   $sniffer,   $document) {
     var currentUrl,
         basePath = $browser.baseHref() || '/',
         pathPrefix = pathPrefixFromBase(basePath),
-        hashPrefix = $locationConfig.hashPrefix || '',
         initUrl = $browser.url();
 
-    if ($locationConfig.html5Mode) {
+    if (html5Mode) {
       if ($sniffer.history) {
         currentUrl = new LocationUrl(convertToHtml5Url(initUrl, basePath, hashPrefix), pathPrefix);
       } else {
@@ -505,13 +525,3 @@ function $LocationProvider(){
     return currentUrl;
 }];
 }
-
-//TODO(misko): refactor to service
-function $LocationConfigProvider(){
-  this.$get = function() {
-    return {
-      html5Mode: false,
-      hashPrefix: ''
-    };
-  };
-}