removing ajax call on editor load

abecms · Aug 31, 2016 · 7daa3b0 · 7daa3b0
1 parent 7bb71ed
commit 7daa3b0
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 21 deletions.
diff --git a/dist/server/public/scripts/modules/EditorReload.js b/dist/server/public/scripts/modules/EditorReload.js
@@ -69,9 +69,31 @@ var Reload = function () {
       }
       return script;
     }
+  }, {
+    key: 'inject',
+    value: function inject(str) {
+      var iframe = document.querySelector('#page-template');
+      var iframeBody = (0, _iframe.IframeDocument)('#page-template').body;
+      var scrollTop = iframeBody.scrollTop;
+
+      var doc = iframe.contentWindow.document;
+      str = str.replace(/<\/head>/, '<base href="/" /></head>');
+      doc.open();
+      doc.write(str);
+      doc.close();
+
+      setTimeout(function () {
+        var iframeDoc = (0, _iframe.IframeDocument)('#page-template');
+        if (typeof iframeDoc !== 'undefined' && iframeDoc !== null && typeof iframeDoc.body !== 'undefined' && iframeDoc.body !== null) {
+          iframeDoc.body.scrollTop = scrollTop;
+        }
+      }, 1000);
+    }
   }, {
     key: 'reload',
     value: function reload() {
+      var _this = this;
+
       var iframe = document.querySelector('#page-template');
       var iframeBody = (0, _iframe.IframeDocument)('#page-template').body;
       var scrollTop = iframeBody.scrollTop;
@@ -88,19 +110,7 @@ var Reload = function () {
         method: 'post'
       }, function (code, responseText, request) {
         if (typeof responseText !== 'undefined' && responseText !== null) {
-          var str = responseText;
-          var doc = iframe.contentWindow.document;
-          str = str.replace(/<\/head>/, '<base href="/" /></head>');
-          doc.open();
-          doc.write(str);
-          doc.close();
-
-          setTimeout(function () {
-            var iframeDoc = (0, _iframe.IframeDocument)('#page-template');
-            if (typeof iframeDoc !== 'undefined' && iframeDoc !== null && typeof iframeDoc.body !== 'undefined' && iframeDoc.body !== null) {
-              iframeDoc.body.scrollTop = scrollTop;
-            }
-          }, 1000);
+          _this.inject(responseText);
         }
 
         return;

diff --git a/dist/server/public/scripts/template-engine-compiled.js b/dist/server/public/scripts/template-engine-compiled.js
diff --git a/dist/server/public/scripts/template-engine.js b/dist/server/public/scripts/template-engine.js
@@ -87,9 +87,33 @@ var Engine = function () {
   }
 
   _createClass(Engine, [{
-    key: 'loadIframe',
-    value: function loadIframe() {
-      _EditorReload2.default.instance.reload();
+    key: 'inject',
+    value: function inject() {
+      var findComments = function findComments(el) {
+        var arr = [];
+        for (var i = 0; i < el.childNodes.length; i++) {
+          var node = el.childNodes[i];
+          if (node.nodeType === 8) {
+            arr.push(node);
+          } else {
+            arr.push.apply(arr, findComments(node));
+          }
+        }
+        return arr;
+      };
+
+      var commentNodes = findComments(document);
+
+      Array.prototype.forEach.call(commentNodes, function (comment) {
+        if (comment.nodeValue.indexOf('[pageHTML]') > -1) {
+          var base = comment.data;
+          if (typeof base !== 'undefined' && base !== null) {
+            base = base.replace(/\[pageHTML\]/g, '');
+            base = base.replace(/-- >/g, '-->');
+            _EditorReload2.default.instance.inject(base);
+          }
+        }
+      });
     }
   }, {
     key: '_bindEvents',
@@ -139,5 +163,5 @@ window.abe = {
 };
 
 document.addEventListener("DOMContentLoaded", function (event) {
-  if (document.querySelector('#page-template')) engine.loadIframe();
+  if (document.querySelector('#page-template')) engine.inject();
 });
diff --git a/dist/server/routes/get-main.js b/dist/server/routes/get-main.js
@@ -184,7 +184,15 @@ var route = function route(req, res, next) {
       _filePath = '/' + _filePath.replace(/^\/+/, '');
     }
 
+    var pageHtml = '';
+    if (typeof _json !== 'undefined' && _json !== null && typeof _json.abe_meta !== 'undefined' && _json.abe_meta !== null) {
+      var text = (0, _cli.getTemplate)(_json.abe_meta.template);
+      var page = new _cli.Page(req.params[0], text, _json, false);
+      pageHtml = page.html.replace(/"/g, '\"').replace(/'/g, "\'");
+    }
+
     var EditorVariables = {
+      pageHtml: pageHtml,
       isHome: isHome,
       abeUrl: '/abe/',
       test: JSON.stringify(_abeLocale2.default),

diff --git a/dist/server/views/template-engine.html b/dist/server/views/template-engine.html
@@ -31,5 +31,8 @@
     <script type="text/javascript" src="/scripts/admin-compiled.js"></script>
 
     {{abeImport 'body' manager.config this}}
+    <!-- [pageHTML] 
+      {{pageHtml}} 
+    [pageHTML] -->
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -76,14 +76,14 @@
     "xss": "^0.2.10"
   },
   "devDependencies": {
-    "node-sass": "3.6.0",
     "babel": "^6.3.26",
     "babel-cli": "^6.3.17",
     "babel-preset-es2015": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
     "babelify": "^7.2.0",
     "browserify": "^13.0.0",
     "mkdirp": "^0.5.1",
+    "node-sass": "^3.6.0",
     "nodemon": "^1.8.1",
     "parallelshell": "^2.0.0",
     "watchify": "^3.4.0"