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

Revert "caseSensitive option added to autocomplete" 

This reverts commit 89601c3115.
This commit is contained in:
Israel 2017-12-02 13:23:03 -05:00
parent 89601c3115
commit 168a65cda4
7 changed files with 123 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/jsoneditor-minimalist.js vendored
View File

@ -25,7 +25,7 @@
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.11.0 * @version 5.11.0
* @date 2017-12-02 * @date 2017-11-22
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')

2
dist/jsoneditor-minimalist.min.js vendored
View File

File diff suppressed because one or more lines are too long

35
dist/jsoneditor.js vendored
View File

@ -25,7 +25,7 @@
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 5.11.0 * @version 5.11.0
* @date 2017-12-02 * @date 2017-11-22
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -16031,7 +16031,6 @@ return /******/ (function(modules) { // webpackBootstrap
function completely(config) { function completely(config) {
config = config || {}; config = config || {};
config.confirmKeys = config.confirmKeys || [39, 35, 9] // right, end, tab config.confirmKeys = config.confirmKeys || [39, 35, 9] // right, end, tab
config.caseSensitive = config.caseSensitive || false // autocomplete case sensitive
var fontSize = ''; var fontSize = '';
var fontFamily = ''; var fontFamily = '';
@ -16076,10 +16075,7 @@ return /******/ (function(modules) { // webpackBootstrap
rows = []; rows = [];
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
if (array[i].indexOf(token) !== 0) { continue; }
if ( (config.caseSensitive && array[i].indexOf(token) !== 0)
||(!config.caseSensitive && array[i].toLowerCase().indexOf(token.toLowerCase()) !== 0)) { continue; }
var divRow = document.createElement('div'); var divRow = document.createElement('div');
divRow.className = 'item'; divRow.className = 'item';
//divRow.style.color = config.color; //divRow.style.color = config.color;
@ -16094,8 +16090,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (rows.length === 0) { if (rows.length === 0) {
return; // nothing to show. return; // nothing to show.
} }
if (rows.length === 1 && ( (token.toLowerCase() === rows[0].__hint.toLowerCase() && !config.caseSensitive) if (rows.length === 1 && token === rows[0].__hint) {
||(token === rows[0].__hint && config.caseSensitive))){
return; // do not show the dropDown if it has only one element which matches what we have just displayed. return; // do not show the dropDown if it has only one element which matches what we have just displayed.
} }
@ -16281,10 +16276,8 @@ return /******/ (function(modules) { // webpackBootstrap
for (var i = 0; i < optionsLength; i++) { for (var i = 0; i < optionsLength; i++) {
var opt = this.options[i]; var opt = this.options[i];
if ( (!config.caseSensitive && opt.toLowerCase().indexOf(token.toLowerCase()) === 0) if (opt.indexOf(token) === 0) { // <-- how about upperCase vs. lowercase
|| (config.caseSensitive && opt.indexOf(token) === 0)) { // <-- how about upperCase vs. lowercase this.elementHint.innerText = leftSide + opt;
this.elementHint.innerText = leftSide + token + opt.substring(token.length);
this.elementHint.realInnerText = leftSide + opt;
break; break;
} }
} }
@ -16318,10 +16311,6 @@ return /******/ (function(modules) { // webpackBootstrap
return; return;
} }
var text = this.element.innerText;
text = text.replace('\n', '');
var startFrom = this.startFrom;
if (config.confirmKeys.indexOf(keyCode) >= 0) { // (autocomplete triggered) if (config.confirmKeys.indexOf(keyCode) >= 0) { // (autocomplete triggered)
if (keyCode == 9) { if (keyCode == 9) {
if (this.elementHint.innerText.length == 0) { if (this.elementHint.innerText.length == 0) {
@ -16329,8 +16318,8 @@ return /******/ (function(modules) { // webpackBootstrap
} }
} }
if (this.elementHint.innerText.length > 0) { // if there is a hint if (this.elementHint.innerText.length > 0) { // if there is a hint
if (this.element.innerText != this.elementHint.realInnerText) { if (this.element.innerText != this.elementHint.innerText) {
this.element.innerText = this.elementHint.realInnerText; this.element.innerText = this.elementHint.innerText;
rs.hideDropDown(); rs.hideDropDown();
setEndOfContenteditable(this.element); setEndOfContenteditable(this.element);
if (keyCode == 9) { if (keyCode == 9) {
@ -16357,7 +16346,7 @@ return /******/ (function(modules) { // webpackBootstrap
return; return;
} }
this.element.innerText = this.elementHint.realInnerText; this.element.innerText = this.elementHint.innerText;
rs.hideDropDown(); rs.hideDropDown();
setEndOfContenteditable(this.element); setEndOfContenteditable(this.element);
e.preventDefault(); e.preventDefault();
@ -16367,22 +16356,18 @@ return /******/ (function(modules) { // webpackBootstrap
} }
if (keyCode == 40) { // down if (keyCode == 40) { // down
var token = text.substring(this.startFrom);
var m = dropDownController.move(+1); var m = dropDownController.move(+1);
if (m == '') { rs.onArrowDown(); } if (m == '') { rs.onArrowDown(); }
this.elementHint.innerText = leftSide + token + m.substring(token.length); this.elementHint.innerText = leftSide + m;
this.elementHint.realInnerText = leftSide + m;
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
return; return;
} }
if (keyCode == 38) { // up if (keyCode == 38) { // up
var token = text.substring(this.startFrom);
var m = dropDownController.move(-1); var m = dropDownController.move(-1);
if (m == '') { rs.onArrowUp(); } if (m == '') { rs.onArrowUp(); }
this.elementHint.innerText = leftSide + token + m.substring(token.length); this.elementHint.innerText = leftSide + m;
this.elementHint.realInnerText = leftSide + m;
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
return; return;

2
dist/jsoneditor.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/api.md
View File

@ -162,10 +162,6 @@ Constructs a new JSONEditor.
Indicate the KeyCodes for trigger confirm completion, by default those keys are: [39, 35, 9] which are the code for [right, end, tab] Indicate the KeyCodes for trigger confirm completion, by default those keys are: [39, 35, 9] which are the code for [right, end, tab]
- `{boolean} caseSensitive`
Indicate if the autocomplete is going to be strict case-sensitive to match the options.
- `{Function} getOptions (text: string, path: string[], input: string, editor: JSONEditor)` - `{Function} getOptions (text: string, path: string[], input: string, editor: JSONEditor)`
This function will return your possible options for create the autocomplete selection, you can control dynamically which options you want to display according to the current active editing node. This function will return your possible options for create the autocomplete selection, you can control dynamically which options you want to display according to the current active editing node.

1
examples/13_autocomplete_advanced.html
View File

@ -36,7 +36,6 @@
var options = { var options = {
autocomplete: { autocomplete: {
confirmKeys: [39, 35, 9, 190], // Confirm Autocomplete Keys: [right, end, tab, '.'] // By default are only [right, end, tab] confirmKeys: [39, 35, 9, 190], // Confirm Autocomplete Keys: [right, end, tab, '.'] // By default are only [right, end, tab]
caseSensitive: true,
getOptions: function (text, path, input, editor) { getOptions: function (text, path, input, editor) {
if (!text.startsWith(activationChar) || input !== 'value') return []; if (!text.startsWith(activationChar) || input !== 'value') return [];

33
src/js/autocomplete.js
View File

@ -3,7 +3,6 @@
function completely(config) { function completely(config) {
config = config || {}; config = config || {};
config.confirmKeys = config.confirmKeys || [39, 35, 9] // right, end, tab config.confirmKeys = config.confirmKeys || [39, 35, 9] // right, end, tab
config.caseSensitive = config.caseSensitive || false // autocomplete case sensitive
var fontSize = ''; var fontSize = '';
var fontFamily = ''; var fontFamily = '';
@ -48,10 +47,7 @@ function completely(config) {
rows = []; rows = [];
for (var i = 0; i < array.length; i++) { for (var i = 0; i < array.length; i++) {
if (array[i].indexOf(token) !== 0) { continue; }
if ( (config.caseSensitive && array[i].indexOf(token) !== 0)
||(!config.caseSensitive && array[i].toLowerCase().indexOf(token.toLowerCase()) !== 0)) { continue; }
var divRow = document.createElement('div'); var divRow = document.createElement('div');
divRow.className = 'item'; divRow.className = 'item';
//divRow.style.color = config.color; //divRow.style.color = config.color;
@ -66,8 +62,7 @@ function completely(config) {
if (rows.length === 0) { if (rows.length === 0) {
return; // nothing to show. return; // nothing to show.
} }
if (rows.length === 1 && ( (token.toLowerCase() === rows[0].__hint.toLowerCase() && !config.caseSensitive) if (rows.length === 1 && token === rows[0].__hint) {
||(token === rows[0].__hint && config.caseSensitive))){
return; // do not show the dropDown if it has only one element which matches what we have just displayed. return; // do not show the dropDown if it has only one element which matches what we have just displayed.
} }
@ -253,10 +248,8 @@ function completely(config) {
for (var i = 0; i < optionsLength; i++) { for (var i = 0; i < optionsLength; i++) {
var opt = this.options[i]; var opt = this.options[i];
if ( (!config.caseSensitive && opt.toLowerCase().indexOf(token.toLowerCase()) === 0) if (opt.indexOf(token) === 0) { // <-- how about upperCase vs. lowercase
|| (config.caseSensitive && opt.indexOf(token) === 0)) { // <-- how about upperCase vs. lowercase this.elementHint.innerText = leftSide + opt;
this.elementHint.innerText = leftSide + token + opt.substring(token.length);
this.elementHint.realInnerText = leftSide + opt;
break; break;
} }
} }
@ -290,10 +283,6 @@ function completely(config) {
return; return;
} }
var text = this.element.innerText;
text = text.replace('\n', '');
var startFrom = this.startFrom;
if (config.confirmKeys.indexOf(keyCode) >= 0) { // (autocomplete triggered) if (config.confirmKeys.indexOf(keyCode) >= 0) { // (autocomplete triggered)
if (keyCode == 9) { if (keyCode == 9) {
if (this.elementHint.innerText.length == 0) { if (this.elementHint.innerText.length == 0) {
@ -301,8 +290,8 @@ function completely(config) {
} }
} }
if (this.elementHint.innerText.length > 0) { // if there is a hint if (this.elementHint.innerText.length > 0) { // if there is a hint
if (this.element.innerText != this.elementHint.realInnerText) { if (this.element.innerText != this.elementHint.innerText) {
this.element.innerText = this.elementHint.realInnerText; this.element.innerText = this.elementHint.innerText;
rs.hideDropDown(); rs.hideDropDown();
setEndOfContenteditable(this.element); setEndOfContenteditable(this.element);
if (keyCode == 9) { if (keyCode == 9) {
@ -329,7 +318,7 @@ function completely(config) {
return; return;
} }
this.element.innerText = this.elementHint.realInnerText; this.element.innerText = this.elementHint.innerText;
rs.hideDropDown(); rs.hideDropDown();
setEndOfContenteditable(this.element); setEndOfContenteditable(this.element);
e.preventDefault(); e.preventDefault();
@ -339,22 +328,18 @@ function completely(config) {
} }
if (keyCode == 40) { // down if (keyCode == 40) { // down
var token = text.substring(this.startFrom);
var m = dropDownController.move(+1); var m = dropDownController.move(+1);
if (m == '') { rs.onArrowDown(); } if (m == '') { rs.onArrowDown(); }
this.elementHint.innerText = leftSide + token + m.substring(token.length); this.elementHint.innerText = leftSide + m;
this.elementHint.realInnerText = leftSide + m;
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
return; return;
} }
if (keyCode == 38) { // up if (keyCode == 38) { // up
var token = text.substring(this.startFrom);
var m = dropDownController.move(-1); var m = dropDownController.move(-1);
if (m == '') { rs.onArrowUp(); } if (m == '') { rs.onArrowUp(); }
this.elementHint.innerText = leftSide + token + m.substring(token.length); this.elementHint.innerText = leftSide + m;
this.elementHint.realInnerText = leftSide + m;
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
return; return;