Implement array size in status bar

This commit is contained in:
jos 2019-07-03 13:10:00 +02:00
parent 9ed18da7b6
commit abc242c873
4 changed files with 80 additions and 7 deletions

View File

@ -13,7 +13,7 @@ div.jsoneditor-statusbar {
div.jsoneditor-statusbar > .jsoneditor-curserinfo-label, div.jsoneditor-statusbar > .jsoneditor-curserinfo-label,
div.jsoneditor-statusbar > .jsoneditor-size-info { div.jsoneditor-statusbar > .jsoneditor-size-info {
margin: 0 2px 0 4px; margin: 0 4px;
} }
div.jsoneditor-statusbar > .jsoneditor-curserinfo-val { div.jsoneditor-statusbar > .jsoneditor-curserinfo-val {
@ -45,3 +45,7 @@ div.jsoneditor-statusbar > .jsoneditor-parse-error-icon {
margin: 1px; margin: 1px;
background: url("img/jsoneditor-icons.svg") -25px 0px; background: url("img/jsoneditor-icons.svg") -25px 0px;
} }
div.jsoneditor-statusbar .jsoneditor-array-info a {
color: inherit;
}

View File

@ -186,4 +186,15 @@ function slice(text, limit) {
: text; : text;
} }
/**
* Test whether some text contains a JSON array, i.e. the first
* non-white space character is a [
* @param {string} jsonText
* @return {boolean}
*/
function containsArray (jsonText) {
return /^\s*\[/.test(jsonText)
}
exports.stringifyPartial = stringifyPartial; exports.stringifyPartial = stringifyPartial;
exports.containsArray = containsArray;

View File

@ -9,6 +9,7 @@ var MAX_PREVIEW_CHARACTERS = require('./constants').MAX_PREVIEW_CHARACTERS;
var DEFAULT_MODAL_ANCHOR = require('./constants').DEFAULT_MODAL_ANCHOR; var DEFAULT_MODAL_ANCHOR = require('./constants').DEFAULT_MODAL_ANCHOR;
var SIZE_LARGE = require('./constants').SIZE_LARGE; var SIZE_LARGE = require('./constants').SIZE_LARGE;
var util = require('./util'); var util = require('./util');
var jsonUtils = require('./jsonUtils');
// create a mixin with the functions for text mode // create a mixin with the functions for text mode
var previewmode = {}; var previewmode = {};
@ -205,11 +206,15 @@ previewmode.create = function (container, options) {
statusBar.className = 'jsoneditor-statusbar'; statusBar.className = 'jsoneditor-statusbar';
this.frame.appendChild(statusBar); this.frame.appendChild(statusBar);
this.dom.sizeInfo = document.createElement('span'); this.dom.fileSizeInfo = document.createElement('span');
this.dom.sizeInfo.className = 'jsoneditor-size-info'; this.dom.fileSizeInfo.className = 'jsoneditor-size-info';
this.dom.sizeInfo.innerText = ''; this.dom.fileSizeInfo.innerText = '';
statusBar.appendChild(this.dom.fileSizeInfo);
statusBar.appendChild(this.dom.sizeInfo); this.dom.arrayInfo = document.createElement('span');
this.dom.arrayInfo.className = 'jsoneditor-size-info';
this.dom.arrayInfo.innerText = '';
statusBar.appendChild(this.dom.arrayInfo);
} }
this.renderPreview(); this.renderPreview();
@ -222,8 +227,42 @@ previewmode.renderPreview = function () {
this.dom.previewText.nodeValue = util.limitCharacters(text, MAX_PREVIEW_CHARACTERS); this.dom.previewText.nodeValue = util.limitCharacters(text, MAX_PREVIEW_CHARACTERS);
if (this.dom.sizeInfo) { if (this.dom.fileSizeInfo) {
this.dom.sizeInfo.innerText = 'Size: ' + util.formatSize(text.length); this.dom.fileSizeInfo.innerText = 'Size: ' + util.formatSize(text.length);
}
if (this.dom.arrayInfo) {
if (Array.isArray(this.json)) {
this.dom.arrayInfo.innerText = ('Array: ' + this.json.length + ' items');
}
else if (jsonUtils.containsArray(this.text)) {
var info = document.createElement('span');
info.className = 'jsoneditor-array-info';
var calculate = document.createElement('a');
var me = this;
calculate.appendChild(document.createTextNode('calculate number of items'));
calculate.href = '#';
calculate.onclick = function () {
me.executeWithBusyMessage(function () {
try {
me.get();
me.renderPreview();
}
catch (err) {
me._onError(err);
}
}, 'parsing...');
}
info.appendChild(document.createTextNode('Array: '));
info.appendChild(calculate);
this.dom.arrayInfo.innerHTML = '';
this.dom.arrayInfo.appendChild(info);
}
else {
this.dom.arrayInfo.innerText = '';
}
} }
}; };
@ -288,6 +327,7 @@ previewmode._showSortModal = function () {
this.executeWithBusyMessage(function () { this.executeWithBusyMessage(function () {
var container = me.options.modalAnchor || DEFAULT_MODAL_ANCHOR; var container = me.options.modalAnchor || DEFAULT_MODAL_ANCHOR;
var json = me.get(); var json = me.get();
me.renderPreview(); // update array count
showSortModal(container, json, function (sortedBy) { showSortModal(container, json, function (sortedBy) {
me.executeWithBusyMessage(function () { me.executeWithBusyMessage(function () {
@ -307,6 +347,7 @@ previewmode._showTransformModal = function () {
this.executeWithBusyMessage(function () { this.executeWithBusyMessage(function () {
var anchor = me.options.modalAnchor || DEFAULT_MODAL_ANCHOR; var anchor = me.options.modalAnchor || DEFAULT_MODAL_ANCHOR;
var json = me.get(); var json = me.get();
me.renderPreview(); // update array count
showTransformModal(anchor, json, function (query) { showTransformModal(anchor, json, function (query) {
me.executeWithBusyMessage(function () { me.executeWithBusyMessage(function () {
@ -343,6 +384,8 @@ previewmode.compact = function () {
// we know that in this case the json is still the same // we know that in this case the json is still the same
this.json = json; this.json = json;
this.renderPreview();
}; };
/** /**
@ -355,6 +398,8 @@ previewmode.format = function () {
// we know that in this case the json is still the same // we know that in this case the json is still the same
this.json = json; this.json = json;
this.renderPreview();
}; };
/** /**

View File

@ -1,5 +1,6 @@
var assert = require('assert'); var assert = require('assert');
var stringifyPartial = require('../src/js/jsonUtils').stringifyPartial; var stringifyPartial = require('../src/js/jsonUtils').stringifyPartial;
var containsArray = require('../src/js/jsonUtils').containsArray;
describe('jsonUtils', function () { describe('jsonUtils', function () {
@ -82,4 +83,16 @@ describe('jsonUtils', function () {
assert.strictEqual(stringifyPartial(12345678, undefined, 4),'1234...'); assert.strictEqual(stringifyPartial(12345678, undefined, 4),'1234...');
}); });
it('should count array items', function () {
// assert.strictEqual(countArrayItems('[1,2,3]'), 3)
assert.strictEqual(containsArray('[]'), true)
assert.strictEqual(containsArray(' []'), true)
assert.strictEqual(containsArray(' \t []'), true)
assert.strictEqual(containsArray(' \t\n []'), true)
assert.strictEqual(containsArray('"["'), false)
assert.strictEqual(containsArray('2'), false)
assert.strictEqual(containsArray('null'), false)
assert.strictEqual(containsArray('{}'), false)
});
}); });