StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #969: adding a new property to an empty object or array is broken

This commit is contained in:
josdejong 2020-04-22 08:56:02 +02:00
parent a292b82792
commit a68ecf5297
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.md
View File

@ -3,6 +3,12 @@
https://github.com/josdejong/jsoneditor https://github.com/josdejong/jsoneditor
## not yet published, version 8.6.6
- Fix #969: adding a new property to an empty object or array is broken.
Regression introduced in `v8.6.5`.
## 2020-04-19, version 8.6.5 ## 2020-04-19, version 8.6.5
- Fix #964: translation of titles of some context menu items not working. - Fix #964: translation of titles of some context menu items not working.

17
src/js/Node.js
View File

@ -3633,15 +3633,6 @@ export class Node {
*/ */
showContextMenu (anchor, onClose) { showContextMenu (anchor, onClose) {
const node = this const node = this
// titles with explanation for the different types
const titles = {
auto: translate('autoType'),
object: translate('objectType'),
array: translate('arrayType'),
string: translate('stringType')
}
let items = [] let items = []
if (this.editable.value) { if (this.editable.value) {
@ -3654,7 +3645,7 @@ export class Node {
text: translate('auto'), text: translate('auto'),
className: 'jsoneditor-type-auto' + className: 'jsoneditor-type-auto' +
(this.type === 'auto' ? ' jsoneditor-selected' : ''), (this.type === 'auto' ? ' jsoneditor-selected' : ''),
title: titles.auto, title: translate('autoType'),
click: function () { click: function () {
node._onChangeType('auto') node._onChangeType('auto')
} }
@ -3663,7 +3654,7 @@ export class Node {
text: translate('array'), text: translate('array'),
className: 'jsoneditor-type-array' + className: 'jsoneditor-type-array' +
(this.type === 'array' ? ' jsoneditor-selected' : ''), (this.type === 'array' ? ' jsoneditor-selected' : ''),
title: titles.array, title: translate('arrayType'),
click: function () { click: function () {
node._onChangeType('array') node._onChangeType('array')
} }
@ -3672,7 +3663,7 @@ export class Node {
text: translate('object'), text: translate('object'),
className: 'jsoneditor-type-object' + className: 'jsoneditor-type-object' +
(this.type === 'object' ? ' jsoneditor-selected' : ''), (this.type === 'object' ? ' jsoneditor-selected' : ''),
title: titles.object, title: translate('objectType'),
click: function () { click: function () {
node._onChangeType('object') node._onChangeType('object')
} }
@ -3681,7 +3672,7 @@ export class Node {
text: translate('string'), text: translate('string'),
className: 'jsoneditor-type-string' + className: 'jsoneditor-type-string' +
(this.type === 'string' ? ' jsoneditor-selected' : ''), (this.type === 'string' ? ' jsoneditor-selected' : ''),
title: titles.string, title: translate('stringType'),
click: function () { click: function () {
node._onChangeType('string') node._onChangeType('string')
} }

10
src/js/appendNodeFactory.js
View File

@ -146,12 +146,12 @@ export function appendNodeFactory (Node) {
*/ */
AppendNode.prototype.showContextMenu = function (anchor, onClose) { AppendNode.prototype.showContextMenu = function (anchor, onClose) {
const node = this const node = this
const titles = Node.TYPE_TITLES
const appendSubmenu = [ const appendSubmenu = [
{ {
text: translate('auto'), text: translate('auto'),
className: 'jsoneditor-type-auto', className: 'jsoneditor-type-auto',
title: titles.auto, title: translate('autoType'),
click: function () { click: function () {
node._onAppend('', '', 'auto') node._onAppend('', '', 'auto')
} }
@ -159,7 +159,7 @@ export function appendNodeFactory (Node) {
{ {
text: translate('array'), text: translate('array'),
className: 'jsoneditor-type-array', className: 'jsoneditor-type-array',
title: titles.array, title: translate('arrayType'),
click: function () { click: function () {
node._onAppend('', []) node._onAppend('', [])
} }
@ -167,7 +167,7 @@ export function appendNodeFactory (Node) {
{ {
text: translate('object'), text: translate('object'),
className: 'jsoneditor-type-object', className: 'jsoneditor-type-object',
title: titles.object, title: translate('objectType'),
click: function () { click: function () {
node._onAppend('', {}) node._onAppend('', {})
} }
@ -175,7 +175,7 @@ export function appendNodeFactory (Node) {
{ {
text: translate('string'), text: translate('string'),
className: 'jsoneditor-type-string', className: 'jsoneditor-type-string',
title: titles.string, title: translate('stringType'),
click: function () { click: function () {
node._onAppend('', '', 'string') node._onAppend('', '', 'string')
} }