Merge branch 'master' of https://github.com/AdFabConnect/abejs

abecms · Sep 7, 2016 · b84ebca · b84ebca
2 parents a51eea0 + ce327b2
commit b84ebca
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/dist/cli/controllers/Save.js b/dist/cli/controllers/Save.js
@@ -168,7 +168,7 @@ function save(url, tplPath) {
 
       text = _.Util.removeDataList(text);
 
-      var res = saveJsonAndHtml(tpl, obj, text, type);
+      var res = saveJsonAndHtml(tpl.replace(/^\/+/, ''), obj, text, type);
 
       obj = _.Hooks.instance.trigger('afterSave', obj);
 
@@ -196,10 +196,8 @@ function splitArray(ar, chunkSize) {
   }));
 }
 
-function saveJsonAndHtml(tplPath, obj, html, type) {
-
-  console.log(tplPath);
-  var page = new _.Page(tplPath, html, obj.json.content, true);
+function saveJsonAndHtml(templateId, obj, html, type) {
+  var page = new _.Page(templateId, html, obj.json.content, true);
 
   saveHtml(obj.html.path, page.html);
   saveJson(obj.json.path, obj.json.content);

diff --git a/dist/cli/models/Manager.js b/dist/cli/models/Manager.js
@@ -72,8 +72,27 @@ var Manager = function () {
 
       _fsExtra2.default.readdirSync(path).forEach(function (file) {
         if (file.indexOf(".hbs") > -1) {
-          var tmpl = eval("(function(){return " + _fsExtra2.default.readFileSync(_cli.fileUtils.concatPath(path, file)) + "}());");
-          _handlebars2.default.templates[file.replace('.hbs', '')] = _handlebars2.default.template(tmpl);
+          var originalTemplatePath = _cli.fileUtils.concatPath(_cli.config.root, _cli.config.templates.url) + '/' + file.replace('.hbs', '.' + _cli.config.files.templates.extension);
+
+          try {
+            var originalTemplateStat = _fsExtra2.default.statSync(originalTemplatePath);
+            var originalTemplateMdate = originalTemplateStat.mtime;
+            var stat = _fsExtra2.default.statSync(_cli.fileUtils.concatPath(path, file));
+            var mdate = stat.mtime;
+
+            // if the original template has been updated after precompilation, I delete the precompiled file
+            // else I add it to the hbs template array
+            if (originalTemplateMdate > mdate) {
+              _fsExtra2.default.unlinkSync(_cli.fileUtils.concatPath(path, file));
+            } else {
+              var tmpl = eval("(function(){return " + _fsExtra2.default.readFileSync(_cli.fileUtils.concatPath(path, file)) + "}());");
+              _handlebars2.default.templates[file.replace('.hbs', '')] = _handlebars2.default.template(tmpl);
+            }
+          } catch (err) {
+            console.log('The original template has not been found or the hbs template is corrupted');
+            console.log(originalTemplatePath);
+            console.log(err);
+          }
         }
       });
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abe-cli",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Abe command line tool",
   "main": "src/server/app.js",
   "repository": {