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

Fixed: shortcut keys to manipulate the nodes are now disabled when mode is `form` or `view`.

This commit is contained in:
jos 2014-07-28 20:56:19 +02:00
parent 1671dc7da7
commit ca84b340bd
5 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.md
View File

@ -9,6 +9,8 @@ https://github.com/josdejong/jsoneditor
valid JSON. For example `{a:2,b:'str'}` can be turned into `{"a":2,"b":"str"}`. valid JSON. For example `{a:2,b:'str'}` can be turned into `{"a":2,"b":"str"}`.
- Implemented an option `editable`, a callback function, which allows to set - Implemented an option `editable`, a callback function, which allows to set
individual nodes (their field and/or value) editable or read-only. individual nodes (their field and/or value) editable or read-only.
- Fixed: shortcut keys to manipulate the nodes are now disabled when mode
is `form` or `view`.
## 2014-05-31, version 3.0.0 ## 2014-05-31, version 3.0.0

44
jsoneditor.js
View File

@ -24,7 +24,7 @@
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 3.1.0-SNAPSHOT * @version 3.1.0-SNAPSHOT
* @date 2014-07-27 * @date 2014-07-28
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -232,7 +232,7 @@ return /******/ (function(modules) { // webpackBootstrap
options.mode = mode; options.mode = mode;
var config = JSONEditor.modes[mode]; var config = JSONEditor.modes[mode];
if (config) { if (config) {
// try { try {
var asText = (config.data == 'text'); var asText = (config.data == 'text');
name = this.getName(); name = this.getName();
data = this[asText ? 'getText' : 'get'](); // get text or json data = this[asText ? 'getText' : 'get'](); // get text or json
@ -251,10 +251,10 @@ return /******/ (function(modules) { // webpackBootstrap
} }
catch (err) {} catch (err) {}
} }
// } }
// catch (err) { catch (err) {
// this._onError(err); this._onError(err);
// } }
} }
else { else {
throw new Error('Unknown mode "' + options.mode + '"'); throw new Error('Unknown mode "' + options.mode + '"');
@ -380,7 +380,7 @@ return /******/ (function(modules) { // webpackBootstrap
this._setOptions(options); this._setOptions(options);
if (this.options.history && !this.mode.view) { if (this.options.history && this.options.mode !== 'view') {
this.history = new History(this); this.history = new History(this);
} }
@ -419,13 +419,6 @@ return /******/ (function(modules) { // webpackBootstrap
} }
} }
} }
// interpret the mode options
this.mode = {
edit: (this.options.mode != 'view' && this.options.mode != 'form'),
view: (this.options.mode == 'view'),
form: (this.options.mode == 'form')
};
}; };
// node currently being edited // node currently being edited
@ -1031,7 +1024,7 @@ return /******/ (function(modules) { // webpackBootstrap
// width, and the edit columns do have a fixed width // width, and the edit columns do have a fixed width
var col; var col;
this.colgroupContent = document.createElement('colgroup'); this.colgroupContent = document.createElement('colgroup');
if (this.mode.edit) { if (this.options.mode === 'tree') {
col = document.createElement('col'); col = document.createElement('col');
col.width = "24px"; col.width = "24px";
this.colgroupContent.appendChild(col); this.colgroupContent.appendChild(col);
@ -2533,10 +2526,10 @@ return /******/ (function(modules) { // webpackBootstrap
}; };
if (this.editor) { if (this.editor) {
this.editable.field = this.editor.mode.edit; this.editable.field = this.editor.options.mode === 'tree';
this.editable.value = !this.editor.mode.view; this.editable.value = this.editor.options.mode !== 'view';
if (this.editor.mode.edit && (typeof this.editor.options.editable === 'function')) { if (this.editor.options.mode === 'tree' && (typeof this.editor.options.editable === 'function')) {
var editable = this.editor.options.editable({ var editable = this.editor.options.editable({
field: this.field, field: this.field,
value: this.value, value: this.value,
@ -3699,7 +3692,7 @@ return /******/ (function(modules) { // webpackBootstrap
dom.tr = document.createElement('tr'); dom.tr = document.createElement('tr');
dom.tr.node = this; dom.tr.node = this;
if (this.editor.mode.edit) { // note: we take here the global setting! if (this.editor.options.mode === 'tree') { // note: we take here the global setting
var tdDrag = document.createElement('td'); var tdDrag = document.createElement('td');
if (this.editable.field) { if (this.editable.field) {
// create draggable area // create draggable area
@ -4444,6 +4437,7 @@ return /******/ (function(modules) { // webpackBootstrap
var altKey = event.altKey; var altKey = event.altKey;
var handled = false; var handled = false;
var prevNode, nextNode, nextDom, nextDom2; var prevNode, nextNode, nextDom, nextDom2;
var editable = this.editor.options.mode === 'tree';
// util.log(ctrlKey, keynum, event.charCode); // TODO: cleanup // util.log(ctrlKey, keynum, event.charCode); // TODO: cleanup
if (keynum == 13) { // Enter if (keynum == 13) { // Enter
@ -4466,7 +4460,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
} }
else if (keynum == 68) { // D else if (keynum == 68) { // D
if (ctrlKey) { // Ctrl+D if (ctrlKey && editable) { // Ctrl+D
this._onDuplicate(); this._onDuplicate();
handled = true; handled = true;
} }
@ -4478,19 +4472,19 @@ return /******/ (function(modules) { // webpackBootstrap
handled = true; handled = true;
} }
} }
else if (keynum == 77) { // M else if (keynum == 77 && editable) { // M
if (ctrlKey) { // Ctrl+M if (ctrlKey) { // Ctrl+M
this.showContextMenu(target); this.showContextMenu(target);
handled = true; handled = true;
} }
} }
else if (keynum == 46) { // Del else if (keynum == 46 && editable) { // Del
if (ctrlKey) { // Ctrl+Del if (ctrlKey) { // Ctrl+Del
this._onRemove(); this._onRemove();
handled = true; handled = true;
} }
} }
else if (keynum == 45) { // Ins else if (keynum == 45 && editable) { // Ins
if (ctrlKey && !shiftKey) { // Ctrl+Ins if (ctrlKey && !shiftKey) { // Ctrl+Ins
this._onInsertBefore(); this._onInsertBefore();
handled = true; handled = true;
@ -4529,7 +4523,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
handled = true; handled = true;
} }
else if (altKey && shiftKey) { // Alt + Shift Arrow left else if (altKey && shiftKey && editable) { // Alt + Shift Arrow left
if (this.expanded) { if (this.expanded) {
var appendDom = this.getAppend(); var appendDom = this.getAppend();
nextDom = appendDom ? appendDom.nextSibling : undefined; nextDom = appendDom ? appendDom.nextSibling : undefined;
@ -4602,7 +4596,7 @@ return /******/ (function(modules) { // webpackBootstrap
} }
handled = true; handled = true;
} }
else if (altKey && shiftKey) { // Alt + Shift + Arrow Down else if (altKey && shiftKey && editable) { // Alt + Shift + Arrow Down
// find the 2nd next node and move before that one // find the 2nd next node and move before that one
if (this.expanded) { if (this.expanded) {
nextNode = this.append ? this.append._nextNode() : undefined; nextNode = this.append ? this.append._nextNode() : undefined;

2
jsoneditor.map
View File

File diff suppressed because one or more lines are too long

6
jsoneditor.min.js vendored
View File

File diff suppressed because one or more lines are too long

15
src/js/Node.js
View File

@ -1204,7 +1204,7 @@ define(['./ContextMenu', './appendNodeFactory', './util'], function (ContextMenu
dom.tr = document.createElement('tr'); dom.tr = document.createElement('tr');
dom.tr.node = this; dom.tr.node = this;
if (this.editor.options.mode === 'tree') { // note: we take here the global setting! if (this.editor.options.mode === 'tree') { // note: we take here the global setting
var tdDrag = document.createElement('td'); var tdDrag = document.createElement('td');
if (this.editable.field) { if (this.editable.field) {
// create draggable area // create draggable area
@ -1949,6 +1949,7 @@ define(['./ContextMenu', './appendNodeFactory', './util'], function (ContextMenu
var altKey = event.altKey; var altKey = event.altKey;
var handled = false; var handled = false;
var prevNode, nextNode, nextDom, nextDom2; var prevNode, nextNode, nextDom, nextDom2;
var editable = this.editor.options.mode === 'tree';
// util.log(ctrlKey, keynum, event.charCode); // TODO: cleanup // util.log(ctrlKey, keynum, event.charCode); // TODO: cleanup
if (keynum == 13) { // Enter if (keynum == 13) { // Enter
@ -1971,7 +1972,7 @@ define(['./ContextMenu', './appendNodeFactory', './util'], function (ContextMenu
} }
} }
else if (keynum == 68) { // D else if (keynum == 68) { // D
if (ctrlKey) { // Ctrl+D if (ctrlKey && editable) { // Ctrl+D
this._onDuplicate(); this._onDuplicate();
handled = true; handled = true;
} }
@ -1983,19 +1984,19 @@ define(['./ContextMenu', './appendNodeFactory', './util'], function (ContextMenu
handled = true; handled = true;
} }
} }
else if (keynum == 77) { // M else if (keynum == 77 && editable) { // M
if (ctrlKey) { // Ctrl+M if (ctrlKey) { // Ctrl+M
this.showContextMenu(target); this.showContextMenu(target);
handled = true; handled = true;
} }
} }
else if (keynum == 46) { // Del else if (keynum == 46 && editable) { // Del
if (ctrlKey) { // Ctrl+Del if (ctrlKey) { // Ctrl+Del
this._onRemove(); this._onRemove();
handled = true; handled = true;
} }
} }
else if (keynum == 45) { // Ins else if (keynum == 45 && editable) { // Ins
if (ctrlKey && !shiftKey) { // Ctrl+Ins if (ctrlKey && !shiftKey) { // Ctrl+Ins
this._onInsertBefore(); this._onInsertBefore();
handled = true; handled = true;
@ -2034,7 +2035,7 @@ define(['./ContextMenu', './appendNodeFactory', './util'], function (ContextMenu
} }
handled = true; handled = true;
} }
else if (altKey && shiftKey) { // Alt + Shift Arrow left else if (altKey && shiftKey && editable) { // Alt + Shift Arrow left
if (this.expanded) { if (this.expanded) {
var appendDom = this.getAppend(); var appendDom = this.getAppend();
nextDom = appendDom ? appendDom.nextSibling : undefined; nextDom = appendDom ? appendDom.nextSibling : undefined;
@ -2107,7 +2108,7 @@ define(['./ContextMenu', './appendNodeFactory', './util'], function (ContextMenu
} }
handled = true; handled = true;
} }
else if (altKey && shiftKey) { // Alt + Shift + Arrow Down else if (altKey && shiftKey && editable) { // Alt + Shift + Arrow Down
// find the 2nd next node and move before that one // find the 2nd next node and move before that one
if (this.expanded) { if (this.expanded) {
nextNode = this.append ? this.append._nextNode() : undefined; nextNode = this.append ? this.append._nextNode() : undefined;