Remove unneed "hasOwnProperty"

Author: tohosaku

src/core.js

@@ -374,28 +374,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/editor.js

@@ -156,9 +156,7 @@ export class AbstractEditor {
 
     const displayMode = this.dependenciesFulfilled ? 'block' : 'none'
     if (wrapper.tagName === 'TD') {
-      for (const child in wrapper.childNodes) {
-        if (wrapper.childNodes.hasOwnProperty(child)) wrapper.childNodes[child].style.display = displayMode
-      }
+      Object.keys(wrapper.childNodes).forEach(child => (wrapper.childNodes[child].style.display = displayMode))
     } else wrapper.style.display = displayMode
   }
 
@@ -229,12 +227,10 @@ export class AbstractEditor {
       let path; let pathParts; let first; let root; let adjustedPath
       const myPath = self.container.getAttribute('data-schemapath')
 
-      for (const name in this.schema.watch) {
-        if (!this.schema.watch.hasOwnProperty(name)) continue
+      Object.keys(this.schema.watch).forEach(name => {
         path = this.schema.watch[name]
-
         if (Array.isArray(path)) {
-          if (path.length < 2) continue
+          if (path.length < 2) return
           pathParts = [path[0]].concat(path[1].split('.'))
         } else {
           pathParts = path.split('.')
@@ -255,7 +251,7 @@ export class AbstractEditor {
         self.jsoneditor.watch(adjustedPath, self.watch_listener)
 
         self.watched[name] = adjustedPath
-      }
+      })
     }
 
     /* Dynamic header */
@@ -409,15 +405,12 @@ export class AbstractEditor {
     const self = this
 
     if (this.watched) {
-      let val
-      let editor
-      for (const name in this.watched) {
-        if (!this.watched.hasOwnProperty(name)) continue
-        editor = self.jsoneditor.getEditor(this.watched[name])
-        val = editor ? editor.getValue() : null
+      Object.keys(this.watched).forEach(name => {
+        const editor = self.jsoneditor.getEditor(this.watched[name])
+        const val = editor ? editor.getValue() : null
         if (self.watched_values[name] !== val) changed = true
         watched[name] = val
-      }
+      })
     }
 
     watched.self = this.getValue()
@@ -649,22 +642,25 @@ export class AbstractEditor {
     if (this.schema.options && this.schema.options.inputAttributes) {
       const inputAttributes = this.schema.options.inputAttributes
       const protectedAttributes = ['name', 'type'].concat(inputAttribute)
-      for (const key in inputAttributes) {
-        if (inputAttributes.hasOwnProperty(key) && !protectedAttributes.includes(key.toLowerCase())) {
+      Object.keys(inputAttributes).forEach(key => {
+        if (!protectedAttributes.includes(key.toLowerCase())) {
           this.input.setAttribute(key, inputAttributes[key])
         }
-      }
+      })
     }
   }
 
   expandCallbacks (scope, options) {
-    for (const i in options) {
-      if (options.hasOwnProperty(i) && options[i] === Object(options[i])) {
-        options[i] = this.expandCallbacks(scope, options[i])
-      } else if (options.hasOwnProperty(i) && typeof options[i] === 'string' && typeof this.defaults.callbacks[scope] === 'object' && typeof this.defaults.callbacks[scope][options[i]] === 'function') {
-        options[i] = this.defaults.callbacks[scope][options[i]].bind(null, this)/* .bind(this); */
+    const callback = this.defaults.callbacks[scope]
+    Object.entries(options).forEach(([key, value]) => {
+      if (value === Object(value)) {
+        options[key] = this.expandCallbacks(scope, value)
+      } else if (typeof value === 'string' &&
+                 typeof callback === 'object' &&
+                 typeof callback[value] === 'function') {
+        options[key] = callback[value].bind(null, this)
       }
-    }
+    })
     return options
   }
 

src/editors/multiselect.js

@@ -21,10 +21,7 @@ export class MultiSelectEditor extends AbstractEditor {
 
   getNumColumns () {
     let longestText = this.getTitle().length
-    for (const i in this.select_values) {
-      if (!this.select_values.hasOwnProperty(i)) continue
-      longestText = Math.max(longestText, (`${this.select_values[i]}`).length + 4)
-    }
+    Object.keys(this.select_values).forEach(i => (longestText = Math.max(longestText, (`${this.select_values[i]}`).length + 4)))
 
     return Math.min(12, Math.max(longestText / 7, 2))
   }
@@ -119,18 +116,16 @@ export class MultiSelectEditor extends AbstractEditor {
   }
 
   setValue (value, initial) {
-    let i
     value = value || []
     if (!(Array.isArray(value))) value = [value]
 
     /* Make sure we are dealing with an array of strings so we can check for strict equality */
     value = value.map(e => `${e}`)
 
     /* Update selected status of options */
-    for (i in this.select_options) {
-      if (!this.select_options.hasOwnProperty(i)) continue
+    Object.keys(this.select_options).forEach(i => {
       this.select_options[i][this.input_type === 'select' ? 'selected' : 'checked'] = (value.includes(i))
-    }
+    })
 
     this.updateValue(value)
     this.onChange(true)
@@ -176,10 +171,7 @@ export class MultiSelectEditor extends AbstractEditor {
       if (this.input) {
         this.input.disabled = false
       } else if (this.inputs) {
-        for (const i in this.inputs) {
-          if (!this.inputs.hasOwnProperty(i)) continue
-          this.inputs[i].disabled = false
-        }
+        Object.keys(this.inputs).forEach(i => (this.inputs[i].disabled = false))
       }
       super.enable()
     }
@@ -190,10 +182,7 @@ export class MultiSelectEditor extends AbstractEditor {
     if (this.input) {
       this.input.disabled = true
     } else if (this.inputs) {
-      for (const i in this.inputs) {
-        if (!this.inputs.hasOwnProperty(i)) continue
-        this.inputs[i].disabled = true
-      }
+      Object.keys(this.inputs).forEach(i => (this.inputs[i].disabled = true))
     }
     super.disable()
   }

src/editors/object.js

@@ -13,20 +13,14 @@ export class ObjectEditor extends AbstractEditor {
   register () {
     super.register()
     if (this.editors) {
-      for (const i in this.editors) {
-        if (!this.editors.hasOwnProperty(i)) continue
-        this.editors[i].register()
-      }
+      Object.values(this.editors).forEach(e => e.register())
     }
   }
 
   unregister () {
     super.unregister()
     if (this.editors) {
-      for (const i in this.editors) {
-        if (!this.editors.hasOwnProperty(i)) continue
-        this.editors[i].unregister()
-      }
+      Object.values(this.editors).forEach(e => e.unregister())
     }
   }
 
@@ -41,13 +35,12 @@ export class ObjectEditor extends AbstractEditor {
 
       super.enable()
       if (this.editors) {
-        for (const i in this.editors) {
-          if (!this.editors.hasOwnProperty(i)) continue
-          if (this.editors[i].isActive()) {
-            this.editors[i].enable()
+        Object.values(this.editors).forEach(e => {
+          if (e.isActive()) {
+            e.enable()
           }
-          this.editors[i].optInCheckbox.disabled = false
-        }
+          e.optInCheckbox.disabled = false
+        })
       }
     }
   }
@@ -60,13 +53,12 @@ export class ObjectEditor extends AbstractEditor {
 
     super.disable()
     if (this.editors) {
-      for (const i in this.editors) {
-        if (!this.editors.hasOwnProperty(i)) continue
-        if (this.editors[i].isActive()) {
-          this.editors[i].disable(alwaysDisabled)
+      Object.values(this.editors).forEach(e => {
+        if (e.isActive()) {
+          e.disable(alwaysDisabled)
         }
-        this.editors[i].optInCheckbox.disabled = true
-      }
+        e.optInCheckbox.disabled = true
+      })
     }
   }
 
@@ -351,15 +343,14 @@ export class ObjectEditor extends AbstractEditor {
 
     /* Any matching patternProperties should be merged in */
     if (this.schema.patternProperties) {
-      for (const i in this.schema.patternProperties) {
-        if (!this.schema.patternProperties.hasOwnProperty(i)) continue
+      Object.keys(this.schema.patternProperties).forEach(i => {
         const regex = new RegExp(i)
         if (regex.test(key)) {
           schema.allOf = schema.allOf || []
           schema.allOf.push(this.schema.patternProperties[i])
           matched = true
         }
-      }
+      })
     }
 
     /* Hasn't matched other rules, use additionalProperties schema */
@@ -1077,21 +1068,18 @@ export class ObjectEditor extends AbstractEditor {
       return undefined
     }
     const result = super.getValue()
+    const isEmpty = i => typeof result[i] === 'undefined' || result[i] === '' ||
+    (
+      result[i] === Object(result[i]) &&
+      Object.keys(result[i]).length === 0 &&
+      result[i].constructor === Object
+    )
     if (this.jsoneditor.options.remove_empty_properties || this.options.remove_empty_properties) {
-      for (const i in result) {
-        if (result.hasOwnProperty(i)) {
-          if (
-            typeof result[i] === 'undefined' ||
-            result[i] === '' ||
-            (
-              result[i] === Object(result[i]) &&
-              Object.keys(result[i]).length === 0 &&
-              result[i].constructor === Object
-            )) {
-            delete result[i]
-          }
+      Object.keys(result).forEach(i => {
+        if (isEmpty(i)) {
+          delete result[i]
         }
-      }
+      })
     }
 
     return result
@@ -1100,12 +1088,11 @@ export class ObjectEditor extends AbstractEditor {
   refreshValue () {
     this.value = {}
 
-    for (const i in this.editors) {
-      if (!this.editors.hasOwnProperty(i)) continue
+    Object.keys(this.editors).forEach(i => {
       if (this.editors[i].isActive()) {
         this.value[i] = this.editors[i].getValue()
       }
-    }
+    })
 
     if (this.adding_property) this.refreshAddProperties()
   }
@@ -1116,13 +1103,10 @@ export class ObjectEditor extends AbstractEditor {
       return
     }
 
-    let canAdd = false; let numProps = 0; let i; let showModal = false
+    let canAdd = false; let numProps = 0; let showModal = false
 
     /* Get number of editors */
-    for (i in this.editors) {
-      if (!this.editors.hasOwnProperty(i)) continue
-      numProps++
-    }
+    Object.keys(this.editors).forEach(i => numProps++)
 
     /* Determine if we can add back removed properties */
     canAdd = this.canHaveAdditionalProperties() && !(typeof this.schema.maxProperties !== 'undefined' && numProps >= this.schema.maxProperties)
@@ -1133,9 +1117,7 @@ export class ObjectEditor extends AbstractEditor {
     this.addproperty_checkboxes = {}
 
     /* Check for which editors can't be removed or added back */
-    for (i in this.cached_editors) {
-      if (!this.cached_editors.hasOwnProperty(i)) continue
-
+    Object.keys(this.cached_editors).forEach(i => {
       this.addPropertyCheckbox(i)
 
       if (this.isRequiredObject(this.cached_editors[i]) && i in this.editors) {
@@ -1155,19 +1137,18 @@ export class ObjectEditor extends AbstractEditor {
       } else {
         showModal = true
       }
-    }
+    })
 
     if (this.canHaveAdditionalProperties()) {
       showModal = true
     }
 
     /* Additional addproperty checkboxes not tied to a current editor */
-    for (i in this.schema.properties) {
-      if (!this.schema.properties.hasOwnProperty(i)) continue
-      if (this.cached_editors[i]) continue
+    Object.keys(this.schema.properties).forEach(i => {
+      if (this.cached_editors[i]) return
       showModal = true
       this.addPropertyCheckbox(i)
-    }
+    })
 
     /* If no editors can be added or removed, hide the modal button */
     if (!showModal) {

src/editors/string.js

@@ -240,21 +240,19 @@ export class StringEditor extends AbstractEditor {
   ajustIMaskOptions (obj) {
     /* iMask config format is not JSON friendly, so function and regex based mask */
     /* properties have to be adjusted from string to the correct format */
-    for (const prop in obj) {
-      if (obj.hasOwnProperty(prop)) {
-        if (obj[prop] === Object(obj[prop])) obj[prop] = this.ajustIMaskOptions(obj[prop])
-        else if (prop === 'mask') {
-          if (obj[prop].substr(0, 6) === 'regex:') {
-            const regExMatch = obj[prop].match(/^regex:\/(.*)\/([gimsuy]*)$/)
-            if (regExMatch !== null) {
-              try {
-                obj[prop] = new RegExp(regExMatch[1], regExMatch[2])
-              } catch (e) { }
-            }
-          } else obj[prop] = this.getGlobalPropertyFromString(obj[prop])
-        }
+    Object.keys(obj).forEach(prop => {
+      if (obj[prop] === Object(obj[prop])) obj[prop] = this.ajustIMaskOptions(obj[prop])
+      else if (prop === 'mask') {
+        if (obj[prop].substr(0, 6) === 'regex:') {
+          const regExMatch = obj[prop].match(/^regex:\/(.*)\/([gimsuy]*)$/)
+          if (regExMatch !== null) {
+            try {
+              obj[prop] = new RegExp(regExMatch[1], regExMatch[2])
+            } catch (e) { }
+          }
+        } else obj[prop] = this.getGlobalPropertyFromString(obj[prop])
       }
-    }
+    })
     return obj
   }