Merge branch 'hotfix/2.0.6'

frontend · Mar 13, 2018 · 8d26e0e · 8d26e0e
2 parents 552c420 + 497c976
commit 8d26e0e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+*2.0.6* (2018-03-13)
+  - ⚡️ improve SinglePage link handling (8e4ed63)
+
 *2.0.4* (2018-03-09)
   - ✨ better inner link handling (ea7dcc8)
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.4
+2.0.6
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.99b383b5.css",
   "main.css.map": "static/css/main.99b383b5.css.map",
-  "main.js": "static/js/main.637ae363.js",
-  "main.js.map": "static/js/main.637ae363.js.map"
+  "main.js": "static/js/main.84e6b589.js",
+  "main.js.map": "static/js/main.84e6b589.js.map"
 }
diff --git a/build/service-worker.js b/build/service-worker.js
diff --git a/build/static/js/main.js b/build/static/js/main.js
diff --git a/build/static/js/main.js.map b/build/static/js/main.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "toolbox-reader",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "private": true,
   "eslintConfig": {
     "parser": "babel-eslint",

diff --git a/src/views/Single/SinglePage.js b/src/views/Single/SinglePage.js
@@ -33,9 +33,11 @@ class SinglePage extends Single {
     // If it's a link related event, redirect to page
     const linkParent = parentUrl(e.target);
     if (linkParent) {
-      e.preventDefault();
-      const slug = linkParent.href.split('/pages/').slice(-1)[0];
-      this.props.history.push(`/pages/${slug}`);
+      if (linkParent.href.includes('pages')) {
+        e.preventDefault();
+        const slug = linkParent.href.split('pages/').slice(-1)[0];
+        this.props.history.push(`/pages/${slug}`);
+      }
     }
   }