jsharmony-cms 1.14.0 → 1.15.1

package/clientjs/jsHarmonyCMS.ComponentManager.js

@@ -423,6 +423,9 @@ exports = module.exports = function(jsh, cms){
       isInComponentEditor: false,
       componentRenderClass: 'jsharmony_cms_componentRender_'+XExt.escapeCSSClass((component&&component.id)||'')+'_'+cms.componentManager.getUniqueId().toString(),
       getMediaThumbnails: function(url){ return cms.componentManager.getMediaThumbnails(url); },
+      getPageVar: function(key){ return undefined; },
+      setPageVar: function(key, val){ },
+      hash: function(val){ return Crypto.MD5((val||'').toString()).toString(); },
       items: data.items,
       item: data.item,
       component: properties,

package/doc/page.json

@@ -51,6 +51,7 @@
                            //  jsharmony_cms_editing                      - Added when currently editing a content element
                            //  jsharmony_cms_editing_<content_element_id> - Added when currently editing a content element
     },
+    "virtual_render": false, // If set to true, page does not export to file system on publish
   },
 
   //System Properties

package/models/Branch_Conflicts.ejs

@@ -272,7 +272,7 @@
         <# }); #>
 
         <div>
-          <# if(_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], (new_media.ext||'').toLowerCase())){ #>
+          <# if(_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], (new_media.ext||'').toLowerCase())){ #>
             <div class="diff_media_preview preview_media" data-media_key="<#=new_media.key#>" data-media_id="<#=new_media.id#>" data-media_ext="<#=new_media.ext#>" data-media_width="<#=new_media.width#>" data-media_height="<#=new_media.height#>">
               <#=desc#>:<br/>
               <img src="<%=jsh._BASEURL%>_funcs/media/<#=new_media.key#>/file_preview?media_id=<#=new_media.id#>" />

package/models/Branch_Diff.ejs

@@ -116,13 +116,13 @@
 
   <# if(branch_media.old_media_file_id != branch_media.new_media_file_id){ #>
     <div>
-      <# if(_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], (branch_media.old_media_ext||'').toLowerCase())){ #>
+      <# if(_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], (branch_media.old_media_ext||'').toLowerCase())){ #>
         <div class="diff_media_preview previous_media" data-media_key="<#=branch_media.media_key#>" data-media_id="<#=branch_media.media_orig_id#>" data-media_ext="<#=branch_media.old_media_ext#>" data-media_width="<#=branch_media.old_media_width#>" data-media_height="<#=branch_media.old_media_height#>">
           Prev:<br/>
           <img src="<%=jsh._BASEURL%>_funcs/media/<#=branch_media.media_key#>/file_preview?media_id=<#=branch_media.media_orig_id#>" />
         </div>
       <# } #>
-      <# if(_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], (branch_media.new_media_ext||'').toLowerCase())){ #>
+      <# if(_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], (branch_media.new_media_ext||'').toLowerCase())){ #>
         <div class="diff_media_preview new_media"  data-media_key="<#=branch_media.media_key#>" data-media_id="<#=branch_media.media_id#>" data-media_ext="<#=branch_media.new_media_ext#>" data-media_width="<#=branch_media.new_media_width#>" data-media_height="<#=branch_media.new_media_height#>">
           New:<br/>
           <img src="<%=jsh._BASEURL%>_funcs/media/<#=branch_media.media_key#>/file_preview?media_id=<#=branch_media.media_id#>" />

package/models/_funcs.component.js

@@ -20,6 +20,7 @@ along with this package.  If not, see <http://www.gnu.org/licenses/>.
 var ejs = require('ejs');
 var _ = require('lodash');
 var async = require('async');
+var crypto = require('crypto');
 var Helper = require('jsharmony/Helper');
 var ejsext = require('jsharmony/lib/ejsext.js');
 
@@ -646,6 +647,7 @@ module.exports = exports = function(module, funcs){
       templateName: null,
       pageComponents: {},
       component: undefined,
+      pageData: undefined,
     }, renderOptions);
 
     var defaultProperties = {};
@@ -655,6 +657,7 @@ module.exports = exports = function(module, funcs){
       defaultData = funcs.getComponentDefaultValues(renderOptions.component.data);
     }
     var properties = _.extend({}, defaultProperties, renderOptions.properties);
+    var pageData = additionalRenderParams.pageData || {};
 
     var renderParams = _.extend({
       baseUrl: '',
@@ -671,11 +674,14 @@ module.exports = exports = function(module, funcs){
       isInEditor: false,
       isInPageEditor: false,
       isInComponentEditor: false,
-      componentRenderClass: 'jsharmony_cms_componentRender_'+Helper.escapeCSSClass((renderOptions.templateName)||'')+'_'+((branchData && branchData.component_getUniqueId && branchData.component_getUniqueId())||'').toString(),
+      componentRenderClass: 'jsharmony_cms_componentRender_'+Helper.escapeCSSClass((renderOptions.templateName)||'')+'_'+((branchData && branchData.component_getUniqueId && branchData.component_getUniqueId(pageData.uniqueIdSalt, pageData.getMaxUniqueId))||'').toString(),
       items: [],
       item: {},
       component: properties,
       getMediaThumbnails: function(url){ return funcs.getMediaThumbnails(url, branchData); },
+      getPageVar: function(key){ if(key=='cmspath') return pageData.cmspath; return pageData.vars && pageData.vars[key]; },
+      setPageVar: function(key, val){ if(!pageData.vars) return; pageData.vars[key] = val; },
+      hash: function(val){ return crypto.createHash('md5').update(val).digest('hex'); },
       renderPlaceholder: function(){ return ''; },
       renderTemplate: function(locals, templateName, items){
         if(!items || (_.isArray(items) && !items.length)) return '';

package/models/_funcs.deploy.js

@@ -163,7 +163,7 @@ module.exports = exports = function(module, funcs){
       for(var thumbnail_id in branchData.site_config.media_thumbnails){
         var thumbnail_config = branchData.site_config.media_thumbnails[thumbnail_id];
         if(!thumbnail_config || !thumbnail_config.export) continue;
-        if(!_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], media.media_ext)) continue;
+        if(!_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], media.media_ext)) continue;
         if((patharr.length >= 5) && patharr[4]) patharr[4] = thumbnail_id;
         else patharr.splice(4,0,thumbnail_id);
         rslt[thumbnail_id] = urlparts.protocol + '//' + urlparts.host + patharr.join('/') + (urlparts.search||'') + (urlparts.hash||'');
@@ -638,8 +638,6 @@ module.exports = exports = function(module, funcs){
           deployment.publish_params = publish_params;
 
           //Branch Data
-          var component_maxUniqueId = 0;
-          var component_maxUniqueIdSalt = crypto.randomBytes(16).toString('hex');
           var branchData = {
             publish_params: publish_params,
             template_variables: template_variables,
@@ -655,12 +653,15 @@ module.exports = exports = function(module, funcs){
             page_redirects: {},
             page_base_paths: {},
             page_files: {},
-            page_data: {},
+            page_data: { /* format, output, vars, cmspath, urlpath, basepath, getMaxUniqueId, uniqueIdSalt */ },
 
             component_templates: null,
             component_template_html: {},
             component_export_template_html: {},
-            component_getUniqueId: function(){ return crypto.createHash('md5').update(component_maxUniqueIdSalt+'.'+(++component_maxUniqueId).toString()).digest('hex'); },
+            component_getUniqueId: function(salt, getMaxUniqueId){
+              if(!salt || !getMaxUniqueId) return crypto.randomBytes(16).toString('hex');
+              return crypto.createHash('md5').update(salt+'.'+(getMaxUniqueId()).toString()).digest('hex');
+            },
 
             media_keys: {},
             media_items: {},
@@ -1314,7 +1315,14 @@ module.exports = exports = function(module, funcs){
           branchData.page_keys[page.page_key] = page_cmspath;
           branchData.page_redirects[page_cmspath] = page_urlpath;
           branchData.page_base_paths[page.page_key] = page_basepath;
-          branchData.page_data[page.page_key] = {};
+          branchData.page_data[page.page_key] = {
+            cmspath: page_cmspath,
+            urlpath: page_urlpath,
+            basepath: page_basepath,
+            getMaxUniqueId: (function(){ var id = 0; return function(){ return ++id; }; })(),
+            uniqueIdSalt: page_basepath,
+            vars: {},
+          };
           if(path.basename(page_cmspath)==publish_params.site_default_page_filename){
             var base_page_dir = publish_params.url_prefix + publish_params.page_subfolder;
             if(!Helper.isNullUndefined(publish_params.url_prefix_page_override)){ base_page_dir = publish_params.url_prefix_page_override; }
@@ -1430,6 +1438,9 @@ module.exports = exports = function(module, funcs){
             var includeCode = '<!--#jsharmony_cms_include('+JSON.stringify(path)+')-->';
             return includeCode;
           };
+          
+          if(!(page.page_key in branchData.page_data)) throw new Error('Page '+page.page_path+' not defined in page_data');
+          var pageData = branchData.page_data[page.page_key];
 
           //Merge content with template
           var ejsparams = {
@@ -1479,6 +1490,7 @@ module.exports = exports = function(module, funcs){
                 getMenuImageURL: function(menu_item){ return funcs.getMenuImageUrl(menu_item, branchData); },
 
                 include: includePage,
+                pageData: pageData,
               };
               if(renderOptions.menu_tag){
                 if(!branchData.menus[renderOptions.menu_tag]) throw new Error('Menu with menu tag "'+Helper.escapeHTML(renderOptions.menu_tag)+'" is not defined in this site');
@@ -1521,6 +1533,7 @@ module.exports = exports = function(module, funcs){
               }
               renderedContent = funcs.renderComponents(renderedContent, branchData, clientPage.template.components, {
                 include: includePage,
+                pageData: pageData,
               });
               renderedContent = funcs.applyRenderTags(renderedContent, { page: ejsparams.page });
               renderedContent = funcs.applyResponsiveImg(renderedContent, branchData.site_config.media_thumbnails, branchData.media_items);
@@ -1541,6 +1554,7 @@ module.exports = exports = function(module, funcs){
                 removeClass: true
               };
               renderedContent = funcs.replaceBranchURLs(renderedContent, replaceBranchURLsParams);
+              pageData.vars = JSON.parse(funcs.replaceBranchURLs(JSON.stringify(pageData.vars), replaceBranchURLsParams));
               pageIncludes = JSON.parse(funcs.replaceBranchURLs(JSON.stringify(pageIncludes), _.extend(replaceBranchURLsParams, {
                 getPageURL: function(page_key){
                   if(!(page_key in branchData.page_keys)) throw new Error('Page '+page.page_path+' links to missing Page ID # '+page_key.toString());
@@ -1552,8 +1566,7 @@ module.exports = exports = function(module, funcs){
 
             try{
               if(exportJSON){
-                if(!(page.page_key in branchData.page_data)) throw new Error('Page '+page.page_path+' not defined in page_data');
-                branchData.page_data[page.page_key].format = 'json';
+                pageData.format = 'json';
                 //Flatten Page
                 var flatPage = funcs.flattenObject(ejsparams.page);
                 //Render Page
@@ -1589,18 +1602,24 @@ module.exports = exports = function(module, funcs){
             branchData.pageIncludes[abskey] = branchData.pageIncludes[abskey].concat(pageIncludes[key]);
           }
 
-          branchData.site_files[page_fpath] = {
-            md5: crypto.createHash('md5').update(page_content).digest('hex')
-          };
-          branchData.page_files[page.page_key] = page_fpath;
-          page_fpath = path.join(publish_params.publish_path, page_fpath);
-
-          //Create folders for path
-          HelperFS.createFolderRecursive(path.dirname(page_fpath), function(err){
-            if(err) return cb(err);
-            //Save page to publish folder
-            fs.writeFile(page_fpath, page_content, 'utf8', cb);
-          });
+          if(clientPage.template.options.virtual_render){
+            pageData.output = page_content;
+            return cb();
+          }
+          else {
+            branchData.site_files[page_fpath] = {
+              md5: crypto.createHash('md5').update(page_content).digest('hex')
+            };
+            branchData.page_files[page.page_key] = page_fpath;
+            page_fpath = path.join(publish_params.publish_path, page_fpath);
+
+            //Create folders for path
+            HelperFS.createFolderRecursive(path.dirname(page_fpath), function(err){
+              if(err) return cb(err);
+              //Save page to publish folder
+              fs.writeFile(page_fpath, page_content, 'utf8', cb);
+            });
+          }
         });
       }, cb);
     });
@@ -1633,7 +1652,6 @@ module.exports = exports = function(module, funcs){
       getMenuURL: function(menu_item){ return funcs.getMenuUrl(menu_item, branchData); },
       getMenuImageURL: function(menu_item){ return funcs.getMenuImageUrl(menu_item, branchData); },
 
-
       page_paths: branchData.page_redirects,
       site_redirects: branchData.site_redirects,
 
@@ -1876,7 +1894,7 @@ module.exports = exports = function(module, funcs){
           function(generate_cb){
             async.eachOf(branchData.site_config.media_thumbnails, function(thumbnail_config, thumbnail_id, thumbnail_cb){
               if(!thumbnail_config || !thumbnail_config.export) return thumbnail_cb();
-              if(!_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], media.media_ext)) return thumbnail_cb();
+              if(!_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], media.media_ext)) return thumbnail_cb();
 
               funcs.getMediaFile(media.media_file_id, media.media_filename, media.media_ext, thumbnail_id, thumbnail_config, function(err, thumbnail_srcpath, thumbnail_fname, stat){
                 if(err) return thumbnail_cb('Error getting thumbnail for '+media_fpath+':'+thumbnail_id+' - '+err.toString());

package/models/_funcs.media.js

@@ -303,7 +303,7 @@ module.exports = exports = function(module, funcs){
 
             //Get image width / height
             function(cb){
-              if(!_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], media_ext)) return cb();
+              if(!_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], media_ext)) return cb();
               jsh.Extensions.image.size(tmp_file_path, function(err, size){
                 if(err || !size || !size.width || !size.height) return cb();
                 media_width = size.width;
@@ -636,7 +636,7 @@ module.exports = exports = function(module, funcs){
 
           //Get image width / height
           function(media_cb){
-            if(!_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.svg'], media_ext)) return media_cb();
+            if(!_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.svg'], media_ext)) return media_cb();
             jsh.Extensions.image.size(tmp_file_path, function(err, size){
               if(err || !size || !size.width || !size.height) return media_cb();
               media_width = size.width;

package/models/_funcs.page.js

@@ -64,6 +64,7 @@ module.exports = exports = function(module, funcs){
           //Template options
           template.options = _.extend({
             title_element_required: true,
+            virtual_render: false,
           }, template.options);
   
           template.options.page_toolbar = _.extend({

package/models/js/site.js

@@ -113,7 +113,7 @@
     var qs = '';
     if(media_id) qs = 'media_id='+media_id;
     else if(media_file_id) qs = 'media_file_id='+media_file_id;
-    if(_.includes(['.jpg','.jpeg','.tif','.tiff','.png','.gif','.pdf','.svg'], media_ext.toLowerCase())){
+    if(_.includes(['.jpg','.jpeg','.webp','.tif','.tiff','.png','.gif','.pdf','.svg'], media_ext.toLowerCase())){
       let url = jsh._BASEURL+'_funcs/media/'+media_key+'/'+(qs?'?'+qs:'');
       var ww = 800;
       var wh = 600;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsharmony-cms",
-  "version": "1.14.0",
+  "version": "1.15.1",
   "description": "jsHarmony CMS",
   "main": "index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "diff2html": "3.4.1",
     "ejs": "2.7.4",
     "js-beautify": "^1.11.0",
-    "jsharmony": "^1.5.2",
+    "jsharmony": "^1.40.15",
     "jsharmony-factory": "^1.2.0",
     "lodash": "^4.17.19",
     "node-forge": "^0.10.0",

package/public/js/jsHarmonyCMS.js

@@ -4791,6 +4791,9 @@ exports = module.exports = function(jsh, cms){
       isInComponentEditor: false,
       componentRenderClass: 'jsharmony_cms_componentRender_'+XExt.escapeCSSClass((component&&component.id)||'')+'_'+cms.componentManager.getUniqueId().toString(),
       getMediaThumbnails: function(url){ return cms.componentManager.getMediaThumbnails(url); },
+      getPageVar: function(key){ return undefined; },
+      setPageVar: function(key, val){ },
+      hash: function(val){ return Crypto.MD5((val||'').toString()).toString(); },
       items: data.items,
       item: data.item,
       component: properties,

package/views/jsh_cms_editor.ejs

@@ -310,6 +310,9 @@ getMenuURL(menu_item)
 getMenuImageURL(menu_item)
 renderPlaceholder({ errors: '' })
 getMediaThumbnails(url)
+getPageVar(key)
+setPageVar(key, val)
+hash(val)
 
 * Only available for Export Components
 addFile(filePath, fileContent)