MAGETWO-90177: Image broken on storefront with secure key enabled

Apply changes to tinymce3Adapter.js

Author: danmooney2

app/code/Magento/Tinymce3/view/base/web/tinymce3Adapter.js

@@ -480,7 +480,9 @@ define([
          * @param {String} directive
          */
         makeDirectiveUrl: function (directive) {
-            return this.config['directives_url'].replace(/directive.*/, 'directive/___directive/' + directive);
+            return this.config['directives_url']
+                .replace(/directive/, 'directive/___directive/' + directive)
+                .replace(/\/$/, '');
         },
 
         /**
@@ -539,10 +541,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,_-]+(?:%2[A-Z]|)+\/?)(?:(?!").)*') + '/?');
 
-            return content.gsub(reg, function (match) { //eslint-disable-line no-extra-bind
-                return Base64.mageDecode(decodeURIComponent(match[1])).replace(/"/g, '"');
+            return content.gsub(reg, function (match) {
+                return Base64.mageDecode(decodeURIComponent(match[1]).replace(/\/$/, '')).replace(/"/g, '"');
             });
         },