Publish `v5.19.2`

This commit is contained in:
jos 2018-08-02 10:45:11 +02:00
parent 46593c24c5
commit ca86cb54bc
9 changed files with 48 additions and 47 deletions

View File

@ -5,7 +5,8 @@ https://github.com/josdejong/jsoneditor
## 2018-08-02, version 5.19.2 ## 2018-08-02, version 5.19.2
- Fixed #558: scrolling to search results broken (regression since v5.19.1). - Fixed #558: scrolling to search results and automatically scrolling up/down
when dragging an item broken (regression since v5.19.1).
## 2018-07-28, version 5.19.1 ## 2018-07-28, version 5.19.1

View File

@ -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.19.1 * @version 5.19.2
* @date 2018-07-28 * @date 2018-08-02
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -772,7 +772,7 @@ return /******/ (function(modules) { // webpackBootstrap
* - to the first button in the top menu * - to the first button in the top menu
*/ */
treemode.focus = function () { treemode.focus = function () {
var input = this.content.querySelector('[contenteditable=true]'); var input = this.scrollableContent.querySelector('[contenteditable=true]');
if (input) { if (input) {
input.focus(); input.focus();
} }
@ -1005,7 +1005,7 @@ return /******/ (function(modules) { // webpackBootstrap
*/ */
treemode.startAutoScroll = function (mouseY) { treemode.startAutoScroll = function (mouseY) {
var me = this; var me = this;
var content = this.content; var content = this.scrollableContent;
var top = util.getAbsoluteTop(content); var top = util.getAbsoluteTop(content);
var height = content.clientHeight; var height = content.clientHeight;
var bottom = top + height; var bottom = top + height;
@ -1069,9 +1069,9 @@ return /******/ (function(modules) { // webpackBootstrap
return; return;
} }
if ('scrollTop' in selection && this.content) { if ('scrollTop' in selection && this.scrollableContent) {
// TODO: animated scroll // TODO: animated scroll
this.content.scrollTop = selection.scrollTop; this.scrollableContent.scrollTop = selection.scrollTop;
} }
if (selection.nodes) { if (selection.nodes) {
// multi-select // multi-select
@ -1104,7 +1104,7 @@ return /******/ (function(modules) { // webpackBootstrap
dom: this.focusTarget, dom: this.focusTarget,
range: range, range: range,
nodes: this.multiselection.nodes.slice(0), nodes: this.multiselection.nodes.slice(0),
scrollTop: this.content ? this.content.scrollTop : 0 scrollTop: this.scrollableContent ? this.scrollableContent.scrollTop : 0
}; };
}; };
@ -1118,7 +1118,7 @@ return /******/ (function(modules) { // webpackBootstrap
* when not. * when not.
*/ */
treemode.scrollTo = function (top, callback) { treemode.scrollTo = function (top, callback) {
var content = this.content; var content = this.scrollableContent;
if (content) { if (content) {
var editor = this; var editor = this;
// cancel any running animation // cancel any running animation

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

16
dist/jsoneditor.js vendored
View File

@ -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.19.1 * @version 5.19.2
* @date 2018-07-28 * @date 2018-08-02
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -8330,7 +8330,7 @@ return /******/ (function(modules) { // webpackBootstrap
* - to the first button in the top menu * - to the first button in the top menu
*/ */
treemode.focus = function () { treemode.focus = function () {
var input = this.content.querySelector('[contenteditable=true]'); var input = this.scrollableContent.querySelector('[contenteditable=true]');
if (input) { if (input) {
input.focus(); input.focus();
} }
@ -8563,7 +8563,7 @@ return /******/ (function(modules) { // webpackBootstrap
*/ */
treemode.startAutoScroll = function (mouseY) { treemode.startAutoScroll = function (mouseY) {
var me = this; var me = this;
var content = this.content; var content = this.scrollableContent;
var top = util.getAbsoluteTop(content); var top = util.getAbsoluteTop(content);
var height = content.clientHeight; var height = content.clientHeight;
var bottom = top + height; var bottom = top + height;
@ -8627,9 +8627,9 @@ return /******/ (function(modules) { // webpackBootstrap
return; return;
} }
if ('scrollTop' in selection && this.content) { if ('scrollTop' in selection && this.scrollableContent) {
// TODO: animated scroll // TODO: animated scroll
this.content.scrollTop = selection.scrollTop; this.scrollableContent.scrollTop = selection.scrollTop;
} }
if (selection.nodes) { if (selection.nodes) {
// multi-select // multi-select
@ -8662,7 +8662,7 @@ return /******/ (function(modules) { // webpackBootstrap
dom: this.focusTarget, dom: this.focusTarget,
range: range, range: range,
nodes: this.multiselection.nodes.slice(0), nodes: this.multiselection.nodes.slice(0),
scrollTop: this.content ? this.content.scrollTop : 0 scrollTop: this.scrollableContent ? this.scrollableContent.scrollTop : 0
}; };
}; };
@ -8676,7 +8676,7 @@ return /******/ (function(modules) { // webpackBootstrap
* when not. * when not.
*/ */
treemode.scrollTo = function (top, callback) { treemode.scrollTo = function (top, callback) {
var content = this.content; var content = this.scrollableContent;
if (content) { if (content) {
var editor = this; var editor = this;
// cancel any running animation // cancel any running animation

2
dist/jsoneditor.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "5.19.1", "version": "5.19.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "jsoneditor", "name": "jsoneditor",
"version": "5.19.1", "version": "5.19.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": [