Released v5.8.2
This commit is contained in:
parent
ee85fb099d
commit
b84621d054
|
@ -3,10 +3,12 @@
|
||||||
https://github.com/josdejong/jsoneditor
|
https://github.com/josdejong/jsoneditor
|
||||||
|
|
||||||
|
|
||||||
## not yet released, version 5.8.2
|
## 2017-07-08, version 5.8.2
|
||||||
|
|
||||||
- Select first option from `modes` instead of `tree` when `mode` is not
|
- Select first option from `modes` instead of `tree` when `mode` is not
|
||||||
configured. Thanks @bag-man.
|
configured. Thanks @bag-man.
|
||||||
|
- Some fixes and improvements in the API of autocompletion.
|
||||||
|
Thanks @israelito3000.
|
||||||
|
|
||||||
|
|
||||||
## 2017-07-03, version 5.8.1
|
## 2017-07-03, version 5.8.1
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
|
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
|
||||||
*
|
*
|
||||||
* @author Jos de Jong, <wjosdejong@gmail.com>
|
* @author Jos de Jong, <wjosdejong@gmail.com>
|
||||||
* @version 5.8.1
|
* @version 5.8.2
|
||||||
* @date 2017-07-03
|
* @date 2017-07-08
|
||||||
*/
|
*/
|
||||||
(function webpackUniversalModuleDefinition(root, factory) {
|
(function webpackUniversalModuleDefinition(root, factory) {
|
||||||
if(typeof exports === 'object' && typeof module === 'object')
|
if(typeof exports === 'object' && typeof module === 'object')
|
||||||
|
@ -215,7 +215,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
this.options = options || {};
|
this.options = options || {};
|
||||||
this.json = json || {};
|
this.json = json || {};
|
||||||
|
|
||||||
var mode = this.options.mode || 'tree';
|
var mode = this.options.modes ? this.options.modes[0] : this.options.mode || 'tree';
|
||||||
this.setMode(mode);
|
this.setMode(mode);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1591,7 +1591,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
// Activate autocomplete
|
// Activate autocomplete
|
||||||
setTimeout(function (hnode, element) {
|
setTimeout(function (hnode, element) {
|
||||||
if (element.innerText.length > 0) {
|
if (element.innerText.length > 0) {
|
||||||
var result = this.options.autocomplete.getOptions(element.innerText, editor.get(), jsonElementType);
|
var result = this.options.autocomplete.getOptions(element.innerText, hnode.getPath(), jsonElementType, hnode.editor);
|
||||||
if (typeof result.then === 'function') {
|
if (typeof result.then === 'function') {
|
||||||
// probably a promise
|
// probably a promise
|
||||||
if (result.then(function (obj) {
|
if (result.then(function (obj) {
|
||||||
|
@ -4486,16 +4486,6 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
return (this.parent ? this.parent.getLevel() + 1 : 0);
|
return (this.parent ? this.parent.getLevel() + 1 : 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Get path of the root node till the current node
|
|
||||||
* @return {Node[]} Returns an array with nodes
|
|
||||||
*/
|
|
||||||
Node.prototype.getNodePath = function() {
|
|
||||||
var path = this.parent ? this.parent.getNodePath() : [];
|
|
||||||
path.push(this);
|
|
||||||
return path;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a clone of a node
|
* Create a clone of a node
|
||||||
* The complete state of a clone is copied, including whether it is expanded or
|
* The complete state of a clone is copied, including whether it is expanded or
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -24,8 +24,8 @@
|
||||||
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
|
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org
|
||||||
*
|
*
|
||||||
* @author Jos de Jong, <wjosdejong@gmail.com>
|
* @author Jos de Jong, <wjosdejong@gmail.com>
|
||||||
* @version 5.8.1
|
* @version 5.8.2
|
||||||
* @date 2017-07-03
|
* @date 2017-07-08
|
||||||
*/
|
*/
|
||||||
(function webpackUniversalModuleDefinition(root, factory) {
|
(function webpackUniversalModuleDefinition(root, factory) {
|
||||||
if(typeof exports === 'object' && typeof module === 'object')
|
if(typeof exports === 'object' && typeof module === 'object')
|
||||||
|
@ -215,7 +215,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
this.options = options || {};
|
this.options = options || {};
|
||||||
this.json = json || {};
|
this.json = json || {};
|
||||||
|
|
||||||
var mode = this.options.mode || 'tree';
|
var mode = this.options.modes ? this.options.modes[0] : this.options.mode || 'tree';
|
||||||
this.setMode(mode);
|
this.setMode(mode);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -9567,7 +9567,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
// Activate autocomplete
|
// Activate autocomplete
|
||||||
setTimeout(function (hnode, element) {
|
setTimeout(function (hnode, element) {
|
||||||
if (element.innerText.length > 0) {
|
if (element.innerText.length > 0) {
|
||||||
var result = this.options.autocomplete.getOptions(element.innerText, editor.get(), jsonElementType);
|
var result = this.options.autocomplete.getOptions(element.innerText, hnode.getPath(), jsonElementType, hnode.editor);
|
||||||
if (typeof result.then === 'function') {
|
if (typeof result.then === 'function') {
|
||||||
// probably a promise
|
// probably a promise
|
||||||
if (result.then(function (obj) {
|
if (result.then(function (obj) {
|
||||||
|
@ -12462,16 +12462,6 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
return (this.parent ? this.parent.getLevel() + 1 : 0);
|
return (this.parent ? this.parent.getLevel() + 1 : 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Get path of the root node till the current node
|
|
||||||
* @return {Node[]} Returns an array with nodes
|
|
||||||
*/
|
|
||||||
Node.prototype.getNodePath = function() {
|
|
||||||
var path = this.parent ? this.parent.getNodePath() : [];
|
|
||||||
path.push(this);
|
|
||||||
return path;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a clone of a node
|
* Create a clone of a node
|
||||||
* The complete state of a clone is copied, including whether it is expanded or
|
* The complete state of a clone is copied, including whether it is expanded or
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "jsoneditor",
|
"name": "jsoneditor",
|
||||||
"version": "5.8.1",
|
"version": "5.8.2",
|
||||||
"main": "./index",
|
"main": "./index",
|
||||||
"description": "A web-based tool to view, edit, format, and validate JSON",
|
"description": "A web-based tool to view, edit, format, and validate JSON",
|
||||||
"tags": [
|
"tags": [
|
||||||
|
|
Loading…
Reference in New Issue