merge upstream

Author: maestr0

HISTORY.md

@@ -3,8 +3,28 @@
 https://github.com/josdejong/jsoneditor
 
 
-## not yet published, version 5.26.4
+## not yet released, version 5.28.0
 
+- Implemented new option `maxVisibleChilds` to customize the maximum number
+  childs that is rendered by default. Thanks @20goto10.
+
+
+## 2019-01-16, version 5.27.1
+
+- Improved navigating deeply nested paths via the navigation bar, see #619.
+  Thanks @meirotstein.
+- Sdd title from schema description to show the tips for user input.
+  Thanks @tylerchen.
+- Fix JSON Schema not resolving refs `$ref`, and not creating enum dropdowns.
+  Thanks @tylerchen.
+
+
+## 2019-01-05, version 5.27.0
+
+- Implemented customizing object and array names via a new option
+  `onNodeName`. Thanks @bnanchen.
+- Visibility of schema validation errors at the bottom of mode code and text
+  are now toggleable. Thanks @meirotstein.
 - Fixed text of the mode switcher not being translated. Thanks @antfu.
 
 

NOTICE

@@ -1,7 +1,7 @@
 JSON Editor
 https://github.com/josdejong/jsoneditor
 
-Copyright (C) 2011-2018 Jos de Jong
+Copyright (C) 2011-2019 Jos de Jong
 
 
 Licensed under the Apache License, Version 2.0 (the "License");

README.md

@@ -2,7 +2,7 @@
 
 [![Version](https://img.shields.io/npm/v/jsoneditor.svg)](https://www.npmjs.com/package/jsoneditor)
 [![Downloads](https://img.shields.io/npm/dm/jsoneditor.svg)](https://www.npmjs.com/package/jsoneditor)
-![Maintenance](https://img.shields.io/maintenance/yes/2018.svg)
+![Maintenance](https://img.shields.io/maintenance/yes/2019.svg)
 [![License](https://img.shields.io/github/license/josdejong/jsoneditor.svg)](https://github.com/josdejong/jsoneditor/blob/master/LICENSE)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fjosdejong%2Fjsoneditor.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fjosdejong%2Fjsoneditor?ref=badge_shield)
 

docs/api.md

@@ -71,11 +71,21 @@ Constructs a new JSONEditor.
   The callback will only be triggered on changes made by the user, not in case of programmatic changes via the functions `set`, `setText`, `update`, or `updateText`.
   See also callback function `onChangeJSON(json)`.
 
-- `{function} onEditable(node)`
+- `{function} onEditable({ field, value, path })`
 
   Set a callback function  to determine whether individual nodes are editable or read-only. Only applicable when option `mode` is `tree`, `text`, or `code`.
 
-  In case of mode `tree`, the callback is invoked as `editable(node)`, where `node` is an object `{field: string, value: string, path: string[]}`. The function must either return a boolean value to set both the nodes field and value editable or read-only, or return an object `{field: boolean, value: boolean}` to set set the read-only attribute for field and value individually.
+  In case of mode `tree`, the callback is invoked as `editable(node)`, where the first parameter is an object:
+
+  ```
+  {
+    field: string,
+    value: string,
+    path: string[]
+  }
+  ```
+
+  The function must either return a boolean value to set both the nodes field and value editable or read-only, or return an object `{field: boolean, value: boolean}` to set set the read-only attribute for field and value individually.
 
   In modes `text` and `code`, the callback is invoked as `editable(node)` where `node` is an empty object (no field, value, or path). In that case the function can return false to make the text or code editor completely read-only.
 
@@ -89,6 +99,24 @@ Constructs a new JSONEditor.
   Set a callback function triggered right after the mode is changed by the user. Only applicable when
   the mode can be changed by the user (i.e. when option `modes` is set).
 
+- `{function} onNodeName({ path, type, size })`
+
+  Customize the name of object and array nodes. By default the names are brackets with the number of childs inside,
+  like `{5}` and `[32]`. The number inside can be customized. using `onNodeName`.
+
+  The first parameter is an object containing the following properties:
+
+  ```
+  {
+    path: string[],
+    type: 'object' | 'array',
+    size: number
+  }
+  ```
+
+  The `onNodeName` function should return a string containing the name for the node. If nothing is returned,
+  the size (number of childs) will be displayed.
+
 - `{function} onValidate(json)`
 
   Set a callback function for custom validation. Available in all modes.
@@ -246,24 +274,24 @@ Constructs a new JSONEditor.
 
   Adds status bar to the bottom of the editor - the status bar shows the cursor position and a count of the selected characters. True by default. Only applicable when `mode` is 'code' or 'text'.
 
-- `{function} onTextSelectionChange`
+- `{function} onTextSelectionChange(start, end, text)`
 
   Set a callback function triggered when a text is selected in the JSONEditor.
 
   callback signature should be:
   ```js
   /**
-  * @param {{row:Number, column:Number}} startPos selection start position
-  * @param {{row:Number, column:Number}} endPos selected end position
+  * @param {{row:Number, column:Number}} start Selection start position
+  * @param {{row:Number, column:Number}} end   Selected end position
   * @param {String} text selected text
   */
-  function onTextSelectionChange(startPos, endPos, text) {
+  function onTextSelectionChange(start, end, text) {
     ...
   }
   ```
   Only applicable when `mode` is 'code' or 'text'.
 
-- `{function} onSelectionChange`
+- `{function} onSelectionChange(start, end)`
 
   Set a callback function triggered when Nodes are selected in the JSONEditor.
 
@@ -281,15 +309,29 @@ Constructs a new JSONEditor.
   ```
   Only applicable when `mode` is 'tree'.
 
-- `{function} onEvent`
+- `{function} onEvent({ field, path, value? }, event)`
 
   Set a callback function that will be triggered when an event will occur in 
   a JSON field or value.
 
   In case of field event, node information will be 
-  `{field: string, path: {string|number}[]}`.
+
+  ```
+  {
+    field: string,
+    path: {string|number}[]
+  }
+  ```
+
   In case of value event, node information will be
-  `{field: string, path: {string|number}[], value: string}`
+
+  ```
+  {
+    field: string,
+    path: {string|number}[],
+    value: string
+  }
+  ```
 
   signature should be:
   ```js
@@ -374,6 +416,10 @@ Constructs a new JSONEditor.
 
   Enable filtering, sorting, and transforming JSON using a [JMESPath](http://jmespath.org/) query. Only applicable for mode 'tree'. True by default.
 
+- `{Number} maxVisibleChilds`
+
+  Number of children allowed for a given node before the "show more / show all" message appears (in 'tree', 'view', or 'form' modes). 100 by default.
+
 ### Methods
 
 #### `JSONEditor.collapseAll()`

examples/20_custom_css_style_for_nodes.html

@@ -97,7 +97,7 @@
       }      
     },
     onChangeJSON: function (j) {
-      rightJson = j;
+      leftJson = j;
     }    
   };
 
@@ -128,7 +128,7 @@
       }      
     },
     onChangeJSON: function (j) {
-      leftJson = j;
+      rightJson = j;
     }    
   };
 

misc/how_to_publish.md

@@ -7,6 +7,10 @@ This document describes the steps required to publish a new version of jsonedito
 
 Update the version number in package.json.
 
+Update package-lock.json:
+
+    npm install
+
 
 ## Update history