Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot-preview[bot] 2f2dcf5dce
Bump uglify-js from 3.11.1 to 3.11.2
Bumps [uglify-js](https://github.com/mishoo/UglifyJS) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/mishoo/UglifyJS/releases)
- [Commits](https://github.com/mishoo/UglifyJS/compare/v3.11.1...v3.11.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-12 05:13:40 +00:00
4 changed files with 50 additions and 83 deletions

6
package-lock.json generated
View File

@ -10006,9 +10006,9 @@
"dev": true
},
"uglify-js": {
"version": "3.11.1",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.1.tgz",
"integrity": "sha512-OApPSuJcxcnewwjSGGfWOjx3oix5XpmrK9Z2j0fTRlHGoZ49IU6kExfZTM0++fCArOOCet+vIfWwFHbvWqwp6g==",
"version": "3.11.2",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.2.tgz",
"integrity": "sha512-G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg==",
"dev": true
},
"unc-path-regex": {

View File

@ -53,7 +53,7 @@
"mocha": "8.1.3",
"source-map-loader": "1.1.0",
"standard": "14.3.4",
"uglify-js": "3.11.1",
"uglify-js": "3.11.2",
"webpack": "4.44.2"
},
"files": [

View File

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

View File

@ -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
}
]