Fix JS error when % appeared in SEO snippet text

ethercreative · Apr 15, 2020 · 58de8d6 · 58de8d6
1 parent 9f491fd
commit 58de8d6
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.6.4 - 2020-04-15
+### Fixed
+- Fix JS error when `%` appeared in SEO snippet text
+
 ## 3.6.3 - 2019-12-18
 ### Improved
 - Replace SVG's while keeping text intact (Fixes #197)

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "ether/seo",
   "license": "MIT",
   "description": "SEO utilities including a unique field type, sitemap, & redirect manager",
-  "version": "3.6.3",
+  "version": "3.6.4",
   "type": "craft-plugin",
   "minimum-stability": "dev",
   "require": {

diff --git a/resources/build.config.js b/resources/build.config.js
@@ -5,6 +5,10 @@ module.exports = {
 	// generate.
 	manifest: null,
 
+	sass: {
+		run: false,
+	},
+
 	less: {
 		// If set to false, Less compilation will not run
 		run: true,

diff --git a/resources/js/field/EntryMarkup.js b/resources/js/field/EntryMarkup.js
@@ -1,4 +1,5 @@
 /* globals $, Craft, Garnish */
+/* eslint-disable no-async-promise-executor */
 /**
  * Entry Markup
  *

diff --git a/resources/js/field/Snippet.js b/resources/js/field/Snippet.js
@@ -38,6 +38,7 @@ export default class Snippet {
 					.trim()
 					.replace(/[\r\n\t]/g, ' ')
 					.replace(/\s{2,}/g, ' ')
+					.replace('%', '%25')
 			);
 		}
 

diff --git a/src/web/assets/css/settings.css b/src/web/assets/css/settings.css
diff --git a/src/web/assets/css/settings.css.map b/src/web/assets/css/settings.css.map
diff --git a/src/web/assets/js/SeoField.min.js b/src/web/assets/js/SeoField.min.js
diff --git a/src/web/assets/js/SeoField.min.js.map b/src/web/assets/js/SeoField.min.js.map
diff --git a/src/web/assets/js/SeoFieldSettings.min.js b/src/web/assets/js/SeoFieldSettings.min.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ export default class Snippet { @@
     					.trim()
     					.replace(/[\r\n\t]/g, ' ')
     					.replace(/\s{2,}/g, ' ')
+    					.replace('%', '%25')
     			);
     		}
@@ Expand Down @@