Merge pull request #8 from codewithkyle/develop

Fixes script import bug when documents don't match
Pageworks · Apr 16, 2019 · 1185e0c · 1185e0c
2 parents 04c2f8e + 99d3faf
commit 1185e0c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.1.1 - 2019-04-16
+
+### Fixes
+
+- Fixes: script loading bug when the current `document` and the incoming `document` don't match
+
 # 2.1.0 - 2019-04-15
 
 ### Adds:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@codewithkyle/pjax",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "Turns any website into a SPA using Fetch and link prefetching.",
     "keywords": [
         "pjax",

diff --git a/pjax.js b/pjax.js
diff --git a/pjax.js.map b/pjax.js.map
diff --git a/src/pjax.ts b/src/pjax.ts
@@ -14,7 +14,7 @@ import PJAX from './global';
 
 export default class Pjax{
 
-    public static VERSION:string    = '2.1.0';
+    public static VERSION:string    = '2.1.1';
 
     public  options:            PJAX.IOptions;
     private _cache:             PJAX.ICacheObject;
@@ -368,6 +368,14 @@ export default class Pjax{
             this.lastChance(this._response.url);
             return;
         }
+
+        if(this.options.importScripts){
+            this.handleScripts(tempDocument);
+        }
+
+        if(this.options.importCSS){
+            this.handleCSS(tempDocument);
+        }
 
         // Check if Pjax needs to wait for the continue event
         if(!this.options.customTransitions){
@@ -424,14 +432,6 @@ export default class Pjax{
 
         StateManager.doReplace(window.location.href, document.title);
 
-        if(this.options.importScripts){
-            this.handleScripts(this._cache.document);
-        }
-
-        if(this.options.importCSS){
-            this.handleCSS(this._cache.document);
-        }
-
         // Build the selector swapping queue
         this.switchSelectors(this.options.selectors, this._cache.document);
     }
@@ -505,14 +505,6 @@ export default class Pjax{
             clearActive();
 
             StateManager.doReplace(window.location.href, document.title);
-
-            if(this.options.importScripts){
-                this.handleScripts(tempDocument);
-            }
-
-            if(this.options.importCSS){
-                this.handleCSS(tempDocument);
-            }
 
             // Swap the current page with the new page
             this.switchSelectors(this.options.selectors, tempDocument);