new version fixing regEx error and HTML entities in get parameters

Breinify · Apr 25, 2019 · af2ebe7 · af2ebe7
1 parent bd165a1
commit af2ebe7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Breinify.js b/src/Breinify.js
@@ -309,9 +309,9 @@
                 return null;
             } else if (value.charAt(0) === '.') {
                 base64 = value.substr(1)
-                    .replace('/~/g', '+')
-                    .replace('/-/g', '/')
-                    .replace('/_/g', '=');
+                    .replace(/~/g, '+')
+                    .replace(/-/g, '/')
+                    .replace(/_/g, '=');
             } else {
                 base64 = decodeURIComponent(value);
             }

diff --git a/src/BreinifyUtil.js b/src/BreinifyUtil.js
@@ -91,7 +91,14 @@
         loc: {
 
             params: function (paramListSeparator, paramSeparator, paramSplit, url) {
-                url = typeof url === 'string' ? url : this.url();
+
+                // if the url is not passed in we use a special decoding for HTML entities
+                // to avoid this, just pass in the url
+                if (typeof url !== 'string') {
+                    var decoder = document.createElement('textarea');
+                    decoder.innerHTML = this.url();
+                    url = decoder.value;
+                }
 
                 paramListSeparator = typeof paramListSeparator === 'string' ? paramListSeparator : '?';
                 paramSeparator = typeof paramSeparator === 'string' ? paramSeparator : '&';