From 8d6239689b8b701ffcdc9bf6faa05c6e40362a4e Mon Sep 17 00:00:00 2001 From: Jairo Caro-Accino Viciana Date: Wed, 2 May 2018 12:22:40 +0200 Subject: [PATCH 1/3] Allow multiple routers interaction --- src/location.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/location.js b/src/location.js index 1bd704e..b843b30 100644 --- a/src/location.js +++ b/src/location.js @@ -2,6 +2,11 @@ function wrapHistory(keys) { return keys.reduce(function(next, key) { var fn = history[key] + // Do not wrap if it's already wrapped + if(history[key].toString().indexOf(`CustomEvent("pushstate"`) !== -1){ + return function(){}; + } + history[key] = function(data, title, url) { fn.call(this, data, title, url) dispatchEvent(new CustomEvent("pushstate", { detail: data })) @@ -41,6 +46,8 @@ export var location = { addEventListener("pushstate", handleLocationChange) addEventListener("popstate", handleLocationChange) + // Trigger actions.set + handleLocationChange({detail: null}); return function() { removeEventListener("pushstate", handleLocationChange) From 7144d8cc3fe3653808cae964d1f6be8cd418d0fe Mon Sep 17 00:00:00 2001 From: Jairo Caro-Accino Viciana Date: Wed, 2 May 2018 12:26:20 +0200 Subject: [PATCH 2/3] rewrite for older NodeJS versions rewrite for older NodeJS versions --- src/location.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/location.js b/src/location.js index b843b30..f940e92 100644 --- a/src/location.js +++ b/src/location.js @@ -3,7 +3,7 @@ function wrapHistory(keys) { var fn = history[key] // Do not wrap if it's already wrapped - if(history[key].toString().indexOf(`CustomEvent("pushstate"`) !== -1){ + if(history[key].toString().indexOf('CustomEvent("pushstate"') !== -1){ return function(){}; } From d5d5f153647419813955f3062aa707b4cfe27092 Mon Sep 17 00:00:00 2001 From: Jairo Date: Tue, 15 May 2018 12:40:04 +0200 Subject: [PATCH 3/3] up --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b96f2ac..102d2f8 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { - "name": "@hyperapp/router", + "name": "hyperapp-patched-router", "description": "Declarative routing for Hyperapp using the History API.", "version": "0.7.0", "main": "dist/router.js", "module": "src/index.js", "license": "MIT", - "repository": "hyperapp/router", + "repository": "kidandcat/router", "files": [ "src", "dist"