WYSIWYG JS - Directive URL not always properly detected magento#7167

jsiefer · Nov 28, 2017 · 44232cd · 44232cd
1 parent 3d628f8
commit 44232cd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
@@ -461,10 +461,10 @@ define([
         decodeDirectives: function (content) {
             // escape special chars in directives url to use it in regular expression
             var url = this.makeDirectiveUrl('%directive%').replace(/([$^.?*!+:=()\[\]{}|\\])/g, '\\$1'),
-                reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9,_-]+)'));
+                reg = new RegExp(url.replace('%directive%', '([a-zA-Z0-9%,_-]+)'));
 
             return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
-                return Base64.mageDecode(match[1]);
+                return Base64.mageDecode(decodeURIComponent(match[1]));
             });
         },