Bump ajv from 6.12.5 to 6.12.6

Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.5 to 6.12.6.
- [Release notes](https://github.com/ajv-validator/ajv/releases)
- [Commits](https://github.com/ajv-validator/ajv/compare/v6.12.5...v6.12.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

package-lock.json

@@ -1368,9 +1368,9 @@
       "dev": true
     },
     "ajv": {
-      "version": "6.12.5",
+      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",

src/js/ace/index.js

@@ -9,7 +9,6 @@ if (window.ace) {
 
     // load required Ace plugins
     require('ace-builds/src-noconflict/mode-json')
-    require('ace-builds/src-noconflict/mode-text')
     require('ace-builds/src-noconflict/ext-searchbox')
 
     // embed Ace json worker

src/js/textmode.js

@@ -68,7 +68,7 @@ textmode.create = function (container, options = {}) {
   // TODO: make the option options.ace deprecated, it's not needed anymore (see #309)
 
   // determine mode
-  this.mode = (options.mode === 'code') ? 'code' : ((options.mode === 'text') ? 'text' : 'text-plain')
+  this.mode = (options.mode === 'code') ? 'code' : 'text'
   if (this.mode === 'code') {
     // verify whether Ace editor is available and supported
     if (typeof _ace === 'undefined') {
@@ -132,7 +132,6 @@ textmode.create = function (container, options = {}) {
     this.frame.appendChild(this.menu)
 
     // create format button
-    if(this.mode !== 'text-plain') {
     const buttonFormat = document.createElement('button')
     buttonFormat.type = 'button'
     buttonFormat.className = 'jsoneditor-format'
@@ -146,10 +145,8 @@ textmode.create = function (container, options = {}) {
         me._onError(err)
       }
     }
-    }
 
     // create compact button
-    if(this.mode !== 'text-plain') {
     const buttonCompact = document.createElement('button')
     buttonCompact.type = 'button'
     buttonCompact.className = 'jsoneditor-compact'
@@ -163,10 +160,9 @@ textmode.create = function (container, options = {}) {
         me._onError(err)
       }
     }
-    }
 
     // create sort button
-    if (this.options.enableSort && this.mode !== 'text-plain') {
+    if (this.options.enableSort) {
       const sort = document.createElement('button')
       sort.type = 'button'
       sort.className = 'jsoneditor-sort'
@@ -178,7 +174,7 @@ textmode.create = function (container, options = {}) {
     }
 
     // create transform button
-    if (this.options.enableTransform && this.mode !== 'text-plain') {
+    if (this.options.enableTransform) {
       const transform = document.createElement('button')
       transform.type = 'button'
       transform.title = translate('transformTitleShort')
@@ -190,7 +186,6 @@ textmode.create = function (container, options = {}) {
     }
 
     // create repair button
-    if(this.mode !== 'text-plain') {
     const buttonRepair = document.createElement('button')
     buttonRepair.type = 'button'
     buttonRepair.className = 'jsoneditor-repair'
@@ -204,10 +199,9 @@ textmode.create = function (container, options = {}) {
         me._onError(err)
       }
     }
-    }
 
     // create undo/redo buttons
-    if (this.mode === 'code' || this.mode === 'text-plain') {
+    if (this.mode === 'code') {
       // create undo button
       const undo = document.createElement('button')
       undo.type = 'button'
@@ -240,7 +234,7 @@ textmode.create = function (container, options = {}) {
       })
     }
 
-    if (this.mode === 'code' || this.mode === 'text-plain') {
+    if (this.mode === 'code') {
       const poweredBy = document.createElement('a')
       poweredBy.appendChild(document.createTextNode('powered by ace'))
       poweredBy.href = 'https://ace.c9.io/'
@@ -264,7 +258,7 @@ textmode.create = function (container, options = {}) {
   this.frame.appendChild(this.content)
   this.container.appendChild(this.frame)
 
-  if (this.mode === 'code' || this.mode === 'text-plain') {
+  if (this.mode === 'code') {
     this.editorDom = document.createElement('div')
     this.editorDom.style.height = '100%' // TODO: move to css
     this.editorDom.style.width = '100%' // TODO: move to css
@@ -277,12 +271,7 @@ textmode.create = function (container, options = {}) {
     aceEditor.setOptions({ readOnly: isReadOnly })
     aceEditor.setShowPrintMargin(false)
     aceEditor.setFontSize('13px')
-    if(this.mode === 'text-plain') {
-      aceSession.setMode('ace/mode/text')
-    }
-    else{
     aceSession.setMode('ace/mode/json')
-    }
     aceSession.setTabSize(this.indentation)
     aceSession.setUseSoftTabs(true)
     aceSession.setUseWrapMode(true)
@@ -702,25 +691,18 @@ textmode.compact = function () {
  */
 textmode.format = function () {
   const json = this.get()
-  if(this.mode !== 'text-plain') {
   const text = JSON.stringify(json, null, this.indentation)
   this.updateText(text)
 }
-  else {
-    this.updateText(json)
-  }
-}
 
 /**
  * Repair the code in the text editor
  */
 textmode.repair = function () {
-  if(this.mode !== 'text-plain') {
   const text = this.getText()
   const repairedText = repair(text)
   this.updateText(repairedText)
 }
-}
 
 /**
  * Set focus to the formatter
@@ -749,13 +731,8 @@ textmode.resize = function () {
  * @param {*} json
  */
 textmode.set = function (json) {
-  if(this.mode !== 'text-plain') {
   this.setText(JSON.stringify(json, null, this.indentation))
 }
-  else{
-    this.setText(json)
-  }
-}
 
 /**
  * Update data. Same as calling `set` in text/code mode.
@@ -852,9 +829,6 @@ textmode.updateText = function (jsonText) {
  * Throws an exception when no JSON schema is configured
  */
 textmode.validate = function () {
-  if(this.mode === 'text-plain') {
-    return
-  }
   let schemaErrors = []
   let parseErrors = []
   let json
@@ -1089,11 +1063,5 @@ export const textModeMixins = [
     mixin: textmode,
     data: 'text',
     load: load
-  },
-  {
-    mode: 'text-plain',
-    mixin: textmode,
-    data: 'text',
-    load: load
   }
 ]