jsharmony-cms 1.5.3 → 1.6.0

package/.eslintrc.js

@@ -0,0 +1,47 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "node": true,
+        "es6": true,
+    },
+    "extends": [
+      "eslint:recommended",
+    ],
+    "parserOptions": {
+        "ecmaVersion": 8
+    },
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/.eslintrc_clientjs.js

@@ -0,0 +1,45 @@
+module.exports = {
+    "env": {
+        "browser": true,
+    },
+    "extends": [
+        "eslint:recommended"
+    ],
+    "parserOptions": {
+        "ecmaVersion": 6
+    },
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/.eslintrc_models.js

@@ -0,0 +1,63 @@
+module.exports = {
+    "env": {
+        "browser": true,
+    },
+    "extends": [
+        "eslint:recommended",
+    ],
+    "parserOptions": {
+        "ecmaVersion": 6
+    },
+    "globals": {
+      "jsh": "readonly",
+      "modelid": "readonly",
+      "XExt": "readonly",
+      "XForm": "readonly",
+      "XPage": "readonly",
+      "XValidate": "readonly",
+      "XBase": "readonly",
+      "XModels": "readonly",
+      "XFormat": "readonly",
+      "$": "readonly",
+      "_": "readonly",
+      "ejs": "readonly",
+      "moment": "readonly",
+      "async": "readonly",
+      "xmodel": "readonly",
+      "_GET": "readonly",
+    },
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/.eslintrc_onroute.js

@@ -0,0 +1,57 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "node": true,
+        "es6": true,
+    },
+    "extends": [
+      "eslint:recommended",
+    ],
+    "globals": {
+      "routetype": "readonly",
+      "req": "readonly",
+      "res": "readonly",
+      "callback": "readonly",
+      "require": "readonly",
+      "jsh": "readonly",
+      "modelid": "readonly",
+      "params": "readonly",
+    },
+    "parserOptions": {
+        "ecmaVersion": 8
+    },
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/.eslintrc_test.js

@@ -0,0 +1,53 @@
+module.exports = {
+    "env": {
+        "browser": true,
+    },
+    "plugins": [
+        "es5"
+    ],
+    "extends": [
+        "eslint:recommended"
+    ],
+    "globals": {
+      "it": "readonly",
+      "describe": "readonly",
+      "after": "readonly",
+      "before": "readonly",
+      "beforeEach": "readonly",
+    },
+    "rules": {
+        "no-trailing-spaces":[
+          "error",
+          { "skipBlankLines": true }
+        ],
+        "indent": [
+            "error",
+            2,
+            { "SwitchCase":1 }
+        ],
+        "linebreak-style": [
+            "error",
+            "windows"
+        ],
+        "quotes": [
+            "error",
+            "single",
+            { "avoidEscape": true }
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-console": "off",
+        "no-unused-vars": [
+          "error",
+          {
+            "args": "none"
+          }
+        ],
+        "no-cond-assign": [
+          "error",
+          "except-parens"
+        ]
+    }
+};

package/clientjs/component/componentModel/componentTemplate.js

@@ -85,8 +85,8 @@ ComponentTemplate.prototype.getCaptions = function() {
     captions.push(this._componentConfig.caption);
     captions.push(this._componentConfig.caption);
   }
-  return captions
-}
+  return captions;
+};
 
 /**
  * Get the component configuration as defined by the component JSON.
@@ -95,7 +95,7 @@ ComponentTemplate.prototype.getCaptions = function() {
  */
 ComponentTemplate.prototype.getComponentConfig = function() {
   return this._componentConfig;
-}
+};
 
 /**
  * Return the editor type
@@ -107,7 +107,7 @@ ComponentTemplate.prototype.getDataEditorType = function() {
     return this._componentConfig.data.layout;
   }
   return undefined;
-}
+};
 
 /**
  * @public
@@ -115,7 +115,7 @@ ComponentTemplate.prototype.getDataEditorType = function() {
  */
 ComponentTemplate.prototype.getDataModelTemplate_FormPreview = function() {
   return this._dataModelTemplate_FormPreview;
-}
+};
 
 /**
  * @public
@@ -123,7 +123,7 @@ ComponentTemplate.prototype.getDataModelTemplate_FormPreview = function() {
  */
 ComponentTemplate.prototype.getDataModelTemplate_GridPreview = function() {
   return this._dataModelTemplate_GridPreview;
-}
+};
 
 /**
  * @public
@@ -131,7 +131,7 @@ ComponentTemplate.prototype.getDataModelTemplate_GridPreview = function() {
  */
 ComponentTemplate.prototype.getPropertiesModelTemplate_Form = function() {
   return this._propertiesModelTemplate_Form;
-}
+};
 
 /**
  * Get the ID specified for the component configuration.
@@ -141,7 +141,7 @@ ComponentTemplate.prototype.getPropertiesModelTemplate_Form = function() {
  */
 ComponentTemplate.prototype.getTemplateId = function() {
   return this._componentConfig.id;
-}
+};
 
 /**
  * Gets the base class name for this component
@@ -150,7 +150,7 @@ ComponentTemplate.prototype.getTemplateId = function() {
  */
 ComponentTemplate.prototype.getClassName = function() {
   return this._componentConfig.className || this._jsh.XExt.escapeCSSClass(this._componentConfig.id, { nodash: true });
-}
+};
 
 /**
  * @private
@@ -175,7 +175,7 @@ ComponentTemplate.prototype.processBrowserFields = function(fields) {
       titleFieldName: field.name + '_jsh_browserDataTitle',
       browserType: browserType,
       validate: field.validate,
-    }
+    };
 
     field.mediaBrowserControlInfo = info;
     field.name = info.titleFieldName;
@@ -218,7 +218,7 @@ ComponentTemplate.prototype.processBrowserFields = function(fields) {
   });
 
   return retVal;
-}
+};
 
 
 exports = module.exports = ComponentTemplate;

package/clientjs/component/componentModel/dataModelTemplate_formPreview.js

@@ -77,10 +77,10 @@ DataModelTemplate_FormPreview.prototype.buildTemplate = function(componentTempla
   var popup = _.isArray(modelConfig.popup) ? modelConfig.popup : [];
 
   var fields = modelConfig.fields || [];
-  fields.unshift({ control:'html', value:'<div class="jsharmony_cms">', captionclass:"hidden"});
-  fields.push({ control:'html', value:'</div>', captionclass:"hidden"});
+  fields.unshift({ control:'html', value:'<div class="jsharmony_cms">', captionclass:'hidden'});
+  fields.push({ control:'html', value:'</div>', captionclass:'hidden'});
   fields.push({
-    caption: '', control:'html', value:'<div class="jsharmony_cms_preview_editor jsharmony_cms_component_preview" data-id="previewWrapper"></div>', 'block':true, captionclass:"hidden"
+    caption: '', control:'html', value:'<div class="jsharmony_cms_preview_editor jsharmony_cms_component_preview" data-id="previewWrapper"></div>', 'block':true, captionclass:'hidden'
   });
 
   var model = _.extend({}, modelConfig);
@@ -116,7 +116,7 @@ DataModelTemplate_FormPreview.prototype.buildTemplate = function(componentTempla
     itemTemplate = templateHtml;
   }
   this._itemTemplate = itemTemplate;
-}
+};
 
 /**
  * Get the link browser field info (if exists) for the link field with
@@ -130,7 +130,7 @@ DataModelTemplate_FormPreview.prototype.getBrowserFieldInfo = function(fieldName
     return field.mediaBrowserControlInfo && field.mediaBrowserControlInfo.dataFieldName === fieldName;
   });
   return field ? field.mediaBrowserControlInfo : undefined;
-}
+};
 
 /**
  * Get the link browser field infos
@@ -145,7 +145,7 @@ DataModelTemplate_FormPreview.prototype.getBrowserFieldInfos = function() {
     }
   });
   return retVal;
-}
+};
 
 /**
  * Get the EJS string used to render the item preview
@@ -154,7 +154,7 @@ DataModelTemplate_FormPreview.prototype.getBrowserFieldInfos = function() {
  */
 DataModelTemplate_FormPreview.prototype.getItemTemplate = function() {
   return this._itemTemplate || '';
-}
+};
 
 /**
  * @public
@@ -164,7 +164,7 @@ DataModelTemplate_FormPreview.prototype.getModelInstance = function() {
   model.id = DataModelTemplate_FormPreview.getNextInstanceId(this._componentTemplate);
 
   return model;
-}
+};
 
 /**
  * Return the raw model JavaScript.
@@ -173,7 +173,7 @@ DataModelTemplate_FormPreview.prototype.getModelInstance = function() {
  */
 DataModelTemplate_FormPreview.prototype.getModelJs = function() {
   return this._rawOriginalJs;
-}
+};
 
 /**
  * Get a unique ID for the model instance
@@ -184,7 +184,7 @@ DataModelTemplate_FormPreview.getNextInstanceId = function(componentTemplate) {
   if (DataModelTemplate_FormPreview._id == undefined) DataModelTemplate_FormPreview._id = 0;
   var id = DataModelTemplate_FormPreview._id++;
   return 'DataModel_FormPreview_' + componentTemplate.getClassName() + '_' + id;
-}
+};
 
 /**
  * Create a pristine copy of the data.
@@ -202,7 +202,7 @@ DataModelTemplate_FormPreview.getNextInstanceId = function(componentTemplate) {
  */
 DataModelTemplate_FormPreview.prototype.makePristineCopy = function(dataInstance) {
   return FieldModel.makePristineCopy(dataInstance, this._modelTemplate.fields);
-}
+};
 
 /**
  * Iterates through the fieldModels
@@ -230,6 +230,6 @@ DataModelTemplate_FormPreview.prototype.makePristineCopy = function(dataInstance
  */
 DataModelTemplate_FormPreview.prototype.populateDataInstance = function(dataInstance) {
   return FieldModel.populateDataInstance(dataInstance, this._modelTemplate.fields || []);
-}
+};
 
 exports = module.exports = DataModelTemplate_FormPreview;

package/clientjs/component/componentModel/dataModelTemplate_gridPreview.js

@@ -142,7 +142,7 @@ DataModelTemplate_GridPreview.prototype.buildTemplate = function(componentTempla
   this._rowTemplate = rowTemplate;
 
   return  model;
-}
+};
 
 /**
  * Ensure that an ID field exists.
@@ -162,7 +162,7 @@ DataModelTemplate_GridPreview.prototype.ensureIdField = function(fields) {
   }
 
   return idFields[0].name;
-}
+};
 
 /**
  * Ensure that a sequence field exists.
@@ -174,14 +174,14 @@ DataModelTemplate_GridPreview.prototype.ensureIdField = function(fields) {
 DataModelTemplate_GridPreview.prototype.ensureSequenceField = function(fields) {
 
   var seqFieldName = 'sequence'; //This is by convention!!!
-  var hasSeqField = _.some(fields, function(field) { return field.name === seqFieldName; })
+  var hasSeqField = _.some(fields, function(field) { return field.name === seqFieldName; });
   if (!hasSeqField) {
     var idField = { name: seqFieldName, type: 'int', control: 'hidden', caption: '', isAutoAddedField: true };
     fields.push(idField);
   }
 
-  return seqFieldName
-}
+  return seqFieldName;
+};
 
 /**
  * Get the name of the field used for the data item ID.
@@ -190,7 +190,7 @@ DataModelTemplate_GridPreview.prototype.ensureSequenceField = function(fields) {
  */
 DataModelTemplate_GridPreview.prototype.getIdFieldName = function() {
   return this._idFieldName;
-}
+};
 
 /**
  * @public
@@ -199,7 +199,9 @@ DataModelTemplate_GridPreview.prototype.getModelInstance = function() {
   var model = Cloner.deepClone(this._modelTemplate);
   model.id = DataModelTemplate_GridPreview.getNextInstanceId(this._componentTemplate);
 
-  model.js =  function() {
+  //model.js is stringified and executed in the context of the model
+  /* globals modelid, jsh */
+  model.js = function() {
     var gridApi = new jsh.XAPI.Grid.Static(modelid);
     var formApi = new jsh.XAPI.Form.Static(modelid);
     return  {
@@ -207,11 +209,11 @@ DataModelTemplate_GridPreview.prototype.getModelInstance = function() {
         if (apiType === 'grid') return gridApi;
         else if (apiType === 'form') return formApi;
       }
-    }
-  }
+    };
+  };
 
   return model;
-}
+};
 
 /**
  * Return the raw model JavaScript.
@@ -220,7 +222,7 @@ DataModelTemplate_GridPreview.prototype.getModelInstance = function() {
  */
 DataModelTemplate_GridPreview.prototype.getModelJs = function() {
   return this._rawOriginalJs;
-}
+};
 
 /**
  * Get a unique ID for the model instance
@@ -231,7 +233,7 @@ DataModelTemplate_GridPreview.getNextInstanceId = function(componentTemplate) {
   if (DataModelTemplate_GridPreview._id == undefined) DataModelTemplate_GridPreview._id = 0;
   var id = DataModelTemplate_GridPreview._id++;
   return 'DataModel_GridPreview_' + componentTemplate.getClassName() + '_' + id;
-}
+};
 
 /**
  * Get the EJS string used to render the row item preview
@@ -240,7 +242,7 @@ DataModelTemplate_GridPreview.getNextInstanceId = function(componentTemplate) {
  */
 DataModelTemplate_GridPreview.prototype.getRowTemplate = function() {
   return this._rowTemplate || '';
-}
+};
 
 /**
  * Create a pristine copy of the data.
@@ -260,7 +262,7 @@ DataModelTemplate_GridPreview.prototype.getRowTemplate = function() {
 DataModelTemplate_GridPreview.prototype.makePristineCopy = function(dataInstance, removeAutoAddedFields) {
   var fields = removeAutoAddedFields ?  _.filter(this._modelTemplate.fields, function(field) { return !field.isAutoAddedField; }) : this._modelTemplate.fields;
   return FieldModel.makePristineCopy(dataInstance, fields);
-}
+};
 
 /**
  * Iterates through the fieldModels
@@ -288,7 +290,7 @@ DataModelTemplate_GridPreview.prototype.makePristineCopy = function(dataInstance
  */
 DataModelTemplate_GridPreview.prototype.populateDataInstance = function(dataInstance) {
   return FieldModel.populateDataInstance(dataInstance, this._modelTemplate.fields || []);
-}
+};
 
 
 exports = module.exports = DataModelTemplate_GridPreview;

package/clientjs/component/componentModel/fieldModel.js

@@ -18,7 +18,6 @@ along with this package.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 var _ = require('lodash');
-var Cloner = require('../utils/cloner');
 var Convert = require('../utils/convert');
 
 /**
@@ -54,7 +53,7 @@ FieldModel.convertTypes = function(dataInstance, fields) {
     tinyint: true,
     decimal: true,
     float: true
-  }
+  };
 
   dataInstance = dataInstance || {};
   _.forEach(fields || [], function(field) {
@@ -67,7 +66,7 @@ FieldModel.convertTypes = function(dataInstance, fields) {
       dataInstance[fieldName] = Convert.toNumber(dataInstance[fieldName]);
     }
   });
-}
+};
 
 /**
  * Create a pristine copy of the data.
@@ -98,7 +97,7 @@ FieldModel.makePristineCopy = function(dataInstance, fields) {
 
   FieldModel.convertTypes(pristineCopy);
   return pristineCopy;
-}
+};
 
 /**
  * Iterates through the fieldModels
@@ -172,6 +171,6 @@ FieldModel.populateDataInstance = function(dataInstance, fields) {
   FieldModel.convertTypes(dataInstance);
   // Must return in case original instance was null/undefined
   return dataInstance;
-}
+};
 
 exports = module.exports = FieldModel;

package/clientjs/component/componentModel/propertiesModelTemplate_form.js

@@ -63,8 +63,8 @@ PropertiesModelTemplate_Form.prototype.buildTemplate = function(componentTemplat
   var model = _.extend({}, modelConfig);
 
   if(modelConfig.fields && modelConfig.fields.length){
-    modelConfig.fields.unshift({ control:'html', value:'<div class="jsharmony_cms">',captionclass:"hidden"});
-    modelConfig.fields.push({ control:'html', value:'</div>',captionclass:"hidden"});
+    modelConfig.fields.unshift({ control:'html', value:'<div class="jsharmony_cms">',captionclass:'hidden'});
+    modelConfig.fields.push({ control:'html', value:'</div>',captionclass:'hidden'});
   }
 
   this._modelTemplate = model;
@@ -74,7 +74,7 @@ PropertiesModelTemplate_Form.prototype.buildTemplate = function(componentTemplat
   model.onecolumn = true;
   if(model.js && _.isString(model.js) && model.js.trim()) model.js = '(function(){ var cms = '+this._cms._instance+';' + model.js + ' })();';
   this._jsh.XPage.ParseModelDefinition(model, null, null, { ignoreErrors: true });
-}
+};
 
 /**
  * @public
@@ -84,7 +84,7 @@ PropertiesModelTemplate_Form.prototype.getModelInstance = function() {
   model.id = PropertiesModelTemplate_Form.getNextInstanceId(this._componentTemplate);
 
   return model;
-}
+};
 
 /**
  * Get a unique ID for the model instance
@@ -95,7 +95,7 @@ PropertiesModelTemplate_Form.getNextInstanceId = function(componentTemplate) {
   if (PropertiesModelTemplate_Form._id == undefined) PropertiesModelTemplate_Form._id = 0;
   var id = PropertiesModelTemplate_Form._id++;
   return 'PropertiesModel_Form_' + componentTemplate.getClassName() + '_' + id;
-}
+};
 
 /**
  * Create a pristine copy of the data.
@@ -113,7 +113,7 @@ PropertiesModelTemplate_Form.getNextInstanceId = function(componentTemplate) {
  */
 PropertiesModelTemplate_Form.prototype.makePristineCopy = function(dataInstance) {
   return FieldModel.makePristineCopy(dataInstance, this._modelTemplate.fields);
-}
+};
 
 /**
  * Iterates through the fieldModels
@@ -141,6 +141,6 @@ PropertiesModelTemplate_Form.prototype.makePristineCopy = function(dataInstance)
  */
 PropertiesModelTemplate_Form.prototype.populateDataInstance = function(dataInstance) {
   return FieldModel.populateDataInstance(dataInstance, this._modelTemplate.fields || []);
-}
+};
 
 exports = module.exports = PropertiesModelTemplate_Form;