Second try fixing #57 (3.3.3)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.3.3
+
+* Another try fixing [#57](https://github.com/krasimir/navigo/issues/57) - now if we have `noHash=false` the hash part of the URL is removed and we are no longer considering it while comparing the last resolved URL.
+
 ## 3.3.2
 
 * Fixing [#57](https://github.com/krasimir/navigo/issues/57) - making sure that we keep the last resolved url when we have the `notFound` handler resolves.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "navigo",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "A simple vanilla JavaScript router with a fallback for older browsers",
   "main": "lib/navigo.js",
   "jsnext:main": "src/index.js",

src/index.js

@@ -99,9 +99,12 @@ function isHashChangeAPIAvailable() {
   );
 }
 
-function extractGETParameters(url) {
+function extractGETParameters(url, useHash) {
   var [ onlyURL, ...query ] = url.split(/\?(.*)?$/);
 
+  if (!useHash) {
+    onlyURL = onlyURL.split('#')[0];
+  }
   return { onlyURL, GETParameters: query.join('') };
 }
 
@@ -184,7 +187,7 @@ Navigo.prototype = {
     if (this._useHash) {
       url = url.replace(/^\/#/, '/');
     }
-    let { onlyURL, GETParameters } = extractGETParameters(url);
+    let { onlyURL, GETParameters } = extractGETParameters(url, this._useHash);
 
     if (
       this._paused ||

test/spec/InBrowser.spec.js

@@ -66,10 +66,12 @@ describe('Given the Navigo library on the page', function () {
 
       window.location.hash = 'tab1';
       router.resolve();
+      window.location.hash = 'tab2';
+      router.resolve();
 
       expect(notFoundHandler).to.be.calledOnce;
       expect(defaultHandler).to.not.be.calledOnce;
-      expect(handler).to.not.be.calledOnce;
+      expect(handler).to.not.be.called;
     });
   });
 });