1.0.2 release

README.md

@@ -256,6 +256,9 @@ You can add the `data-bb-options` attribute to your anchor to allow passing of t
 * Open `test/test-runner.html` to run the in-browser test suite, or run `npm test` for headless.
 
 ## Change Log
+### 1.0.2
+* Bugfix: queryParams defined in state.url are dropped from the _urlAsTemplate
+
 ### 1.0.1
 * Bugfix: queryParams are getting dropped when transition navigate occurs
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Backbone.Manager",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "https://github.com/novu/Backbone.Manager",
   "author": "Johnathon Sanders",
   "description": "State-Based Routing/Control Manager for Backbone",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Backbone.Manager",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "State-Based Routing/Control Manager for Backbone",
   "homepage": "https://github.com/novu/backbone.manager",
   "bugs": "https://github.com/novu/backbone.manager/issues",

release/backbone.manager.js

@@ -1,6 +1,6 @@
 /**
  * Backbone.Manager - State-Based Routing/Control Manager for Backbone
- * @version v1.0.1
+ * @version v1.0.2
  * @link https://github.com/novu/backbone.manager
  * @author Johnathon Sanders
  * @license MIT
@@ -10,7 +10,7 @@
   managers = [];
   managerQueue = _.extend({}, Backbone.Events);
   onloadUrl = window.location.href;
-  cachedParamMatcher = /[:*]([^(:)/]+)/g;
+  cachedParamMatcher = /[:*]([^(:?)/]+)/g;
   cachedOptionalMatcher = /\(.*\)/g;
   currentManager = null;
   Manager = (function() {
@@ -108,7 +108,12 @@
           queryParams = _.last(params);
           url = stateOptions._urlAsTemplate(paramsObject);
           if (queryParams) {
-            url += '?' + queryParams;
+            if (url.indexOf('?') > -1) {
+              url += '&';
+            } else {
+              url += '?';
+            }
+            url += queryParams;
           }
           if (!historyHasUpdated && transitionOptions.navigate) {
             this.router.navigate(url);