Remove "self"

Author: tohosaku

src/core.js

@@ -223,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

src/editor.js

@@ -92,14 +92,13 @@ export class AbstractEditor {
       return
     }
 
-    const self = this
     Object.keys(deps).forEach(dependency => {
-      let path = self.path.split('.')
+      let path = this.path.split('.')
       path[path.length - 1] = dependency
       path = path.join('.')
       const choices = deps[dependency]
-      self.jsoneditor.watch(path, () => {
-        self.checkDependency(path, choices)
+      this.jsoneditor.watch(path, () => {
+        this.checkDependency(path, choices)
       })
     })
   }
@@ -110,7 +109,6 @@ export class AbstractEditor {
       return
     }
 
-    const self = this
     const editor = this.jsoneditor.getEditor(path)
     const value = editor ? editor.getValue() : undefined
     const previousStatus = this.dependenciesFulfilled
@@ -121,7 +119,7 @@ export class AbstractEditor {
     } else if (Array.isArray(choices)) {
       choices.some(choice => {
         if (value === choice) {
-          self.dependenciesFulfilled = true
+          this.dependenciesFulfilled = true
           return true
         }
       })
@@ -134,10 +132,10 @@ export class AbstractEditor {
             return false
           }
           if (!hasOwnProperty(value, key) || choices[key] !== value[key]) {
-            self.dependenciesFulfilled = false
+            this.dependenciesFulfilled = false
             return true
           }
-          self.dependenciesFulfilled = true
+          this.dependenciesFulfilled = true
         })
       }
     } else if (typeof choices === 'string' || typeof choices === 'number') {
@@ -169,17 +167,17 @@ export class AbstractEditor {
 
   setOptInCheckbox (header) {
     /* the active/deactive checbox control. */
-    const self = this
+
     this.optInCheckbox = document.createElement('input')
     this.optInCheckbox.setAttribute('type', 'checkbox')
     this.optInCheckbox.setAttribute('style', 'margin: 0 10px 0 0;')
     this.optInCheckbox.classList.add('json-editor-opt-in')
 
     this.optInCheckbox.addEventListener('click', () => {
-      if (self.isActive()) {
-        self.deactivate()
+      if (this.isActive()) {
+        this.deactivate()
       } else {
-        self.activate()
+        this.activate()
       }
     })
 
@@ -211,21 +209,19 @@ export class AbstractEditor {
   }
 
   setupWatchListeners () {
-    const self = this
-
     /* Watched fields */
     this.watched = {}
     if (this.schema.vars) this.schema.watch = this.schema.vars
     this.watched_values = {}
     this.watch_listener = () => {
-      if (self.refreshWatchedFieldValues()) {
-        self.onWatchedFieldChange()
+      if (this.refreshWatchedFieldValues()) {
+        this.onWatchedFieldChange()
       }
     }
 
     if (hasOwnProperty(this.schema, 'watch')) {
       let path; let pathParts; let first; let root; let adjustedPath
-      const myPath = self.container.getAttribute('data-schemapath')
+      const myPath = this.container.getAttribute('data-schemapath')
 
       Object.keys(this.schema.watch).forEach(name => {
         path = this.schema.watch[name]
@@ -234,23 +230,23 @@ export class AbstractEditor {
           pathParts = [path[0]].concat(path[1].split('.'))
         } else {
           pathParts = path.split('.')
-          if (!self.theme.closest(self.container, `[data-schemaid="${pathParts[0]}"]`)) pathParts.unshift('#')
+          if (!this.theme.closest(this.container, `[data-schemaid="${pathParts[0]}"]`)) pathParts.unshift('#')
         }
         first = pathParts.shift()
 
-        if (first === '#') first = self.jsoneditor.schema.id || 'root'
+        if (first === '#') first = this.jsoneditor.schema.id || 'root'
 
         /* Find the root node for this template variable */
-        root = self.theme.closest(self.container, `[data-schemaid="${first}"]`)
+        root = this.theme.closest(this.container, `[data-schemaid="${first}"]`)
         if (!root) throw new Error(`Could not find ancestor node with id ${first}`)
 
         /* Keep track of the root node and path for use when rendering the template */
         adjustedPath = `${root.getAttribute('data-schemapath')}.${pathParts.join('.')}`
 
-        if (myPath.startsWith(adjustedPath)) self.watchLoop = true
-        self.jsoneditor.watch(adjustedPath, self.watch_listener)
+        if (myPath.startsWith(adjustedPath)) this.watchLoop = true
+        this.jsoneditor.watch(adjustedPath, this.watch_listener)
 
-        self.watched[name] = adjustedPath
+        this.watched[name] = adjustedPath
       })
     }
 
@@ -402,13 +398,12 @@ export class AbstractEditor {
     if (!this.watched_values) return
     const watched = {}
     let changed = false
-    const self = this
 
     if (this.watched) {
       Object.keys(this.watched).forEach(name => {
-        const editor = self.jsoneditor.getEditor(this.watched[name])
+        const editor = this.jsoneditor.getEditor(this.watched[name])
         const val = editor ? editor.getValue() : null
-        if (self.watched_values[name] !== val) changed = true
+        if (this.watched_values[name] !== val) changed = true
         watched[name] = val
       })
     }
@@ -504,10 +499,9 @@ export class AbstractEditor {
   }
 
   destroy () {
-    const self = this
     this.unregister(this)
     if (this.watched) {
-      Object.values(this.watched).forEach(adjustedPath => self.jsoneditor.unwatch(adjustedPath, self.watch_listener))
+      Object.values(this.watched).forEach(adjustedPath => this.jsoneditor.unwatch(adjustedPath, this.watch_listener))
     }
 
     this.watched = null

src/editors/ace.js

@@ -19,7 +19,6 @@ export class AceEditor extends StringEditor {
   }
 
   afterInputReady () {
-    const self = this
     let options
 
     if (window.ace) {
@@ -56,13 +55,13 @@ export class AceEditor extends StringEditor {
 
       /* Listen for changes */
       this.ace_editor_instance.on('change', () => {
-        self.input.value = self.ace_editor_instance.getValue()
-        self.refreshValue()
-        self.is_dirty = true
-        self.onChange(true)
+        this.input.value = this.ace_editor_instance.getValue()
+        this.refreshValue()
+        this.is_dirty = true
+        this.onChange(true)
       })
 
-      this.theme.afterInputReady(self.input)
+      this.theme.afterInputReady(this.input)
     } else super.afterInputReady() /* Library not loaded, so just treat this as a string */
   }