jsharmony-cms 1.15.0 → 1.15.1

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.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||'');
@@ -1894,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/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.15.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",