Merge pull request #56 from swipely/fix_broken_query_string_with_hash…

…_routing

Fix broken query string parsing with hash routing

aviator.js

@@ -333,7 +333,23 @@ Navigator.prototype = {
   @return {String|Null}
   **/
   getQueryString: function () {
-    return location.search || null;
+    var uri, queryString;
+
+    if (this.pushStateEnabled) {
+      return location.search || null;
+    }
+    else {
+      uri = this.getCurrentURI();
+
+      if (uri.indexOf('?') !== -1) {
+        queryString = uri.split('?')[1];
+
+        return queryString ? '?' + queryString : null;
+      }
+      else {
+        return null
+      }
+    }
   },
 
   /**
@@ -426,8 +442,9 @@ Navigator.prototype = {
   @param {Object} [options]
   **/
   navigate: function (uri, options) {
-    var options = options || {},
-        namedParams = options.namedParams,
+    options = options || {};
+
+    var namedParams = options.namedParams,
         queryParams = options.queryParams;
 
     // halt any previous action invocations

package.json

@@ -10,7 +10,7 @@
     "grunt-browserify": "~1.2.0"
   },
   "scripts": {
-    "test": "./node_modules/grunt-cli/bin/grunt jasmine --verbose"
+    "test": "./node_modules/grunt-cli/bin/grunt test"
   },
   "engine": {
     "node": ">=0.8.x"

spec/navigator_spec.js

@@ -19,6 +19,44 @@ describe('Navigator', function () {
     window.history.replaceState({}, '', '/_SpecRunner.html');
   });
 
+  describe('#getQueryString', function () {
+    describe('with push state disabled', function () {
+      beforeEach(function () {
+        subject.pushStateEnabled = false;
+      });
+
+      describe('and a query string in the current uri', function () {
+        beforeEach(function () {
+          spyOn( subject, 'getCurrentURI' ).andReturn( 'foo/bar?baz=123' );
+        });
+
+        it('gets the queryString from the hash url', function () {
+          expect( subject.getQueryString() ).toBe( '?baz=123' );
+        });
+      });
+
+      describe('and a no query string in the current uri', function () {
+        beforeEach(function () {
+          spyOn( subject, 'getCurrentURI' ).andReturn( 'foo/bar' );
+        });
+
+        it('gets the queryString from the hash url', function () {
+          expect( subject.getQueryString() ).toBe( null );
+        });
+      });
+
+      describe('and an empty query string in the current uri', function () {
+        beforeEach(function () {
+          spyOn( subject, 'getCurrentURI' ).andReturn( 'foo/bar?' );
+        });
+
+        it('gets the queryString from the hash url', function () {
+          expect( subject.getQueryString() ).toBe( null );
+        });
+      });
+    });
+  });
+
   describe('#getCurrentURI', function () {
     var root;
 

src/navigator.js

@@ -97,7 +97,23 @@ Navigator.prototype = {
   @return {String|Null}
   **/
   getQueryString: function () {
-    return location.search || null;
+    var uri, queryString;
+
+    if (this.pushStateEnabled) {
+      return location.search || null;
+    }
+    else {
+      uri = this.getCurrentURI();
+
+      if (uri.indexOf('?') !== -1) {
+        queryString = uri.split('?')[1];
+
+        return (queryString ? '?' + queryString : null);
+      }
+      else {
+        return null;
+      }
+    }
   },
 
   /**