Fix adding the hash to search and path

Author: oliverguenther

src/location/locationService.ts

@@ -19,13 +19,21 @@ export class Ng2LocationServices extends BaseLocationServices {
 
   _set(state: any, title: string, url: string, replace: boolean): any {
     const { path, search, hash } = parseUrl(url);
-    const urlPart = search ? path : path + (hash ? '#' + hash : '');
-    const searchPart = search + (hash ? '#' + hash : '');
+
+    const hashWithPrefix = hash ? '#' + hash : '';
+    let urlPath = path;
+    let urlParams = search;
+
+    if (search) {
+      urlParams += hashWithPrefix;
+    } else {
+      urlPath += hashWithPrefix;
+    }
 
     if (replace) {
-      this._locationStrategy.replaceState(state, title, urlPart, searchPart);
+      this._locationStrategy.replaceState(state, title, urlPath, urlParams);
     } else {
-      this._locationStrategy.pushState(state, title, urlPart, searchPart);
+      this._locationStrategy.pushState(state, title, urlPath, urlParams);
     }
   }
 

test/location/locationService.spec.ts

@@ -44,6 +44,10 @@ describe('locationService', () => {
       expectUrlReadAfterWrite(HashLocationStrategy, '/foo');
     });
 
+    it('should read/write the url path with single hash', () => {
+      expectUrlReadAfterWrite(HashLocationStrategy, '/foo#test');
+    });
+
     it('should read/write query params', () => {
       expectUrlReadAfterWrite(HashLocationStrategy, '/foo?query1=value1');
     });
@@ -66,6 +70,10 @@ describe('locationService', () => {
       expectUrlReadAfterWrite(PathLocationStrategy, '/foo');
     });
 
+    it('should read/write the url path with single hash', () => {
+      expectUrlReadAfterWrite(HashLocationStrategy, '/foo#test');
+    });
+
     it('should read/write query params', () => {
       expectUrlReadAfterWrite(PathLocationStrategy, '/foo?query1=value1');
     });