Merge pull request jdorn#691 from tohosaku/update_standard

Use Arrow function and Remove "self"

Author: schmunk42

package-lock.json

@@ -83,12 +83,10 @@
     "null-loader": "^3.0.0",
     "postcss-loader": "^3.0.0",
     "puppeteer": "^1.20.0",
-    "puppeteer-firefox": "^0.5.1",
     "remove-strict-webpack-plugin": "^0.1.2",
-    "requirejs": "^2.3.6",
     "sceditor": "^2.1.3",
     "sinon": "^8.1.1",
-    "standard": "^11.0.1",
+    "standard": "^14.3.3",
     "style-loader": "^1.1.3",
     "webpack": "^4.41.6",
     "webpack-cli": "^3.3.11",

package.json

@@ -5,7 +5,7 @@ import { editors } from './editors/index.js'
 import { templates } from './templates/index.js'
 import { iconlibs } from './iconlibs/index.js'
 import { themes } from './themes/index.js'
-import { extend, each, getShadowParent } from './utilities.js'
+import { extend, getShadowParent, hasOwnProperty } from './utilities.js'
 
 export class JSONEditor {
   constructor (element, options = {}) {
@@ -74,7 +74,7 @@ export class JSONEditor {
       this.root.postBuild()
 
       /* Starting data */
-      if (this.options.hasOwnProperty('startval')) this.root.setValue(this.options.startval)
+      if (hasOwnProperty(this.options, 'startval')) this.root.setValue(this.options.startval)
 
       this.validation_results = this.validator.validate(this.root.getValue())
       this.root.showValidationErrors(this.validation_results)
@@ -191,24 +191,18 @@ export class JSONEditor {
   }
 
   getEditorsRules () {
-    const rules = {}
-
-    each(JSONEditor.defaults.editors, (i, editorClass) => editorClass.rules && extend(rules, editorClass.rules))
-
-    return rules
+    const extendRule = (rules, editorClass) => editorClass.rules ? extend(rules, editorClass.rules) : rules
+    return Object.values(JSONEditor.defaults.editors).reduce(extendRule, {})
   }
 
   getEditorClass (schema) {
     let classname
 
     schema = this.expandSchema(schema)
 
-    each(JSONEditor.defaults.resolvers, (i, resolver) => {
-      const tmp = resolver(schema)
-      if (tmp && JSONEditor.defaults.editors[tmp]) {
-        classname = tmp
-        return false
-      }
+    JSONEditor.defaults.resolvers.find(resolver => {
+      classname = resolver(schema)
+      return classname && JSONEditor.defaults.editors[classname]
     })
 
     if (!classname) throw new Error(`Unknown editor for schema ${JSON.stringify(schema)}`)
@@ -229,23 +223,21 @@ export class JSONEditor {
     if (this.firing_change) return
     this.firing_change = true
 
-    const self = this
-
     window.requestAnimationFrame(() => {
-      self.firing_change = false
-      if (!self.ready) return
+      this.firing_change = false
+      if (!this.ready) return
 
       /* Validate and cache results */
-      self.validation_results = self.validator.validate(self.root.getValue())
+      this.validation_results = this.validator.validate(this.root.getValue())
 
-      if (self.options.show_errors !== 'never') {
-        self.root.showValidationErrors(self.validation_results)
+      if (this.options.show_errors !== 'never') {
+        this.root.showValidationErrors(this.validation_results)
       } else {
-        self.root.showValidationErrors([])
+        this.root.showValidationErrors([])
       }
 
       /* Fire change event */
-      self.trigger('change')
+      this.trigger('change')
     })
 
     return this
@@ -374,28 +366,24 @@ export class JSONEditor {
     const sheet = styleTag.sheet ? styleTag.sheet : styleTag.styleSheet
     const qualifier = this.element.nodeName.toLowerCase()
 
-    for (var selector in rules) {
-      if (!rules.hasOwnProperty(selector)) continue
-      var sel = qualifier + '[data-theme="' + themeName + '"] ' + selector
+    Object.keys(rules).forEach(selector => {
+      const sel = `${qualifier}[data-theme="${themeName}"] ${selector}`
 
       // all browsers, except IE before version 9
       if (sheet.insertRule) sheet.insertRule(sel + ' {' + decodeURIComponent(rules[selector]) + '}', 0)
       // Internet Explorer before version 9
       else if (sheet.addRule) sheet.addRule(sel, decodeURIComponent(rules[selector]), 0)
-    }
+    })
   }
 
   addNewStyleRulesToShadowRoot (themeName, rules, shadowRoot) {
     const qualifier = this.element.nodeName.toLowerCase()
     let cssText = ''
 
-    for (var selector in rules) {
-      if (!rules.hasOwnProperty(selector)) continue
-      var sel = qualifier + '[data-theme="' + themeName + '"] ' + selector
-
+    Object.keys(rules).forEach(selector => {
+      const sel = `${qualifier}[data-theme="${themeName}"] ${selector}`
       cssText += sel + ' {' + decodeURIComponent(rules[selector]) + '}' + '\n'
-    }
-
+    })
     const styleSheet = new CSSStyleSheet()
     styleSheet.replaceSync(cssText)
     shadowRoot.adoptedStyleSheets = [...shadowRoot.adoptedStyleSheets, styleSheet]

src/core.js

@@ -1,4 +1,3 @@
-import { each } from './utilities.js'
 import { resolvers } from './resolvers.js'
 
 /* default theme */
@@ -252,7 +251,7 @@ languages.en = {
 }
 
 /* Default per-editor options */
-each(editors, (i, editor) => { editors[i].options = editor.options || {} })
+Object.entries(editors).forEach(([i, editor]) => { editors[i].options = editor.options || {} })
 
 /* Default upload handler */
 function upload (type, file, cbs) {