page transition race conditions

Profiscience · Jul 19, 2016 · 91c0eea · 91c0eea
1 parent ddbf794
commit 91c0eea
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/dist/ko-component-router.js b/dist/ko-component-router.js
@@ -347,7 +347,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	      var push = arguments.length <= 2 || arguments[2] === undefined ? true : arguments[2];
 	      var query = arguments.length <= 3 || arguments[3] === undefined ? false : arguments[3];
 
-	      // debugger
 	      var url = this.resolveUrl(origUrl);
 	      var route = this.getRouteForUrl(url);
 	      var firstRun = this.route() === '';
@@ -373,7 +372,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      var samePage = this.pathname() === pathname;
 
-	      var shouldNavigatePromise = samePage ? this.$child ? this.$child.update(childPath || '/', false, false, false) : Promise.resolve(true) : this.runBeforeNavigateCallbacks();
+	      var shouldNavigatePromise = samePage ? this.$child ? this.$child.update(childPath || '/', state, false, query) : Promise.resolve(true) : this.runBeforeNavigateCallbacks();
 
 	      return shouldNavigatePromise.then(function (shouldNavigate) {
 	        if (!shouldNavigate) {

diff --git a/dist/ko-component-router.min.js b/dist/ko-component-router.min.js
diff --git a/example/dist/bundle.js b/example/dist/bundle.js
diff --git a/example/dist/bundle.js.map b/example/dist/bundle.js.map
diff --git a/lib/context.js b/lib/context.js
@@ -80,7 +80,6 @@ var Context = function () {
       var push = arguments.length <= 2 || arguments[2] === undefined ? true : arguments[2];
       var query = arguments.length <= 3 || arguments[3] === undefined ? false : arguments[3];
 
-      // debugger
       var url = this.resolveUrl(origUrl);
       var route = this.getRouteForUrl(url);
       var firstRun = this.route() === '';
@@ -106,7 +105,7 @@ var Context = function () {
 
       var samePage = this.pathname() === pathname;
 
-      var shouldNavigatePromise = samePage ? this.$child ? this.$child.update(childPath || '/', false, false, false) : Promise.resolve(true) : this.runBeforeNavigateCallbacks();
+      var shouldNavigatePromise = samePage ? this.$child ? this.$child.update(childPath || '/', state, false, query) : Promise.resolve(true) : this.runBeforeNavigateCallbacks();
 
       return shouldNavigatePromise.then(function (shouldNavigate) {
         if (!shouldNavigate) {

diff --git a/src/context.js b/src/context.js
@@ -46,7 +46,6 @@ export default class Context {
   }
 
   update(origUrl = this.canonicalPath(), state = false, push = true, query = false) {
-    // debugger
     const url = this.resolveUrl(origUrl)
     const route = this.getRouteForUrl(url)
     const firstRun = this.route() === ''
@@ -62,7 +61,7 @@ export default class Context {
     const shouldNavigatePromise =
       samePage
         ? this.$child
-          ? this.$child.update(childPath || '/', false, false, false)
+          ? this.$child.update(childPath || '/', state, false, query)
           : Promise.resolve(true)
         : this.runBeforeNavigateCallbacks()