FIX issue #7 - Weird image request

magespecialist · Feb 15, 2017 · 9267d7b · 9267d7b
1 parent 7e202a0
commit 9267d7b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
 
   },
   "type": "magento2-module",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "license": "OSL 3.0",
   "autoload": {
     "files": [

diff --git a/etc/module.xml b/etc/module.xml
@@ -21,7 +21,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="MSP_DevTools" setup_version="0.2.0">
+    <module name="MSP_DevTools" setup_version="0.2.1">
         <sequence>
             <module name="MSP_Common"/>
 

diff --git a/view/base/web/js/lib/knockout/template/loader.js b/view/base/web/js/lib/knockout/template/loader.js
@@ -27,21 +27,21 @@ define(
         'use strict';
 
         /**
-     * Formats path of type "path.to.template" to RequireJS compatible
-     *
-     * @param  {String} path
-     * @return {String} - formatted template path
-     */
+         * Formats path of type "path.to.template" to RequireJS compatible
+         *
+         * @param  {String} path
+         * @return {String} - formatted template path
+         */
         function formatTemplatePath(path)
         {
             return 'text!' + path.replace(/^([^\/]+)/g, '$1/template') + '.html';
         }
 
         /**
-     * Get a random block for MSP devtools
-     *
-     * @returns {string}
-     */
+         * Get a random block for MSP devtools
+         *
+         * @returns {string}
+         */
         function getRandomBlockId()
         {
             var text = "";
@@ -56,11 +56,16 @@ define(
         CoreLoader.loadTemplateOrig = CoreLoader.loadTemplate;
 
         CoreLoader.loadTemplate = function (path) {
-            var res = CoreLoader.loadTemplateOrig(path);
-            var defer = $.Deferred();
+            var content = CoreLoader.loadTemplateOrig(path);
 
-            if (res) {
-                res.done(
+            if (!window.mspDevTools) {
+                return content;
+            }
+
+            if (content) {
+                var defer = $.Deferred();
+
+                content.done(
                     function (tmpl) {
                         var mspBlockId = getRandomBlockId();
 
@@ -71,6 +76,9 @@ define(
                             id: mspBlockId
                         };
 
+                        // we need this to prevent parseHTML to load images
+                        tmpl = tmpl.replace(/\s+src\s*=\s*/, " msp-tmp-src=");
+
                         var fragmentsOut = [];
                         var fragmentsIn = _.toArray($.parseHTML(tmpl));
                         for (var i=0; i<fragmentsIn.length; i++) {
@@ -88,6 +96,8 @@ define(
                         }
 
                         tmpl = fragmentsOut.join('');
+                        tmpl = tmpl.replace(/&lt;%=(.+?)%&gt;/, '<%=$1%>');
+                        tmpl = tmpl.replace(/\s+msp-tmp-src=/, " src=");
 
                         if (!window.mspDevTools) {
                             window.mspDevTools = {};
@@ -98,14 +108,15 @@ define(
 
                         window.mspDevTools['uiComponents'][mspBlockId] = payload;
                         window.postMessage('mspDevToolsUpdate', '*', []);
+
                         defer.resolve(tmpl);
                     }
                 );
 
                 return defer.promise();
             }
 
-            return res;
+            return this.loadFromFile(path);
         };
 
         return CoreLoader;