Skip to content

highlight separators - bracket,squarebracket,comma #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

highlight separators - bracket,squarebracket,comma #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/json-viewer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
padding-left: 20px;
}

span.jsonseparators {
color: #77cee4ec;
}

.json-viewer ul {
list-style-type: none;
margin: 0;
Expand Down
37 changes: 30 additions & 7 deletions src/json-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* JSONViewer - by Roman Makudera 2016 (c) MIT licence.
*/
var JSONViewer = (function(document) {
var JSONViewer = (function(document) {
var Object_prototype_toString = ({}).toString;
var DatePrototypeAsString = Object_prototype_toString.call(new Date);

Expand Down Expand Up @@ -60,7 +60,7 @@ var JSONViewer = (function(document) {
// root level
var rootCount = _createItemsCount(items.length);
// hide/show
var rootLink = _createLink(isArray ? "[" : "{");
var rootLink = _createLink(isArray ? "<span class=\"jsonseparators\">[</span>" : "<span class=\"jsonseparators\">{</span>");

if (items.length) {
rootLink.addEventListener("click", function() {
Expand Down Expand Up @@ -109,11 +109,21 @@ var JSONViewer = (function(document) {

// empty
if (!itemLen) {
li.appendChild(document.createTextNode(key + ": " + (itemIsArray ? "[]" : "{}")));
let span = document.createElement('span');
span.classList.add('list-link');
let emptyArrayOrHt = document.createTextNode(key + ": ");
span.appendChild(emptyArrayOrHt);
li.appendChild(span);

let spanx = document.createElement('span');
spanx.classList.add('jsonseparators');
let emptyArrayOrHtx = document.createTextNode(itemIsArray ? "[]" : "{}");
spanx.appendChild(emptyArrayOrHtx);
li.appendChild(spanx);
}
else {
// 1+ items
var itemTitle = (typeof key === "string" ? key + ": " : "") + (itemIsArray ? "[" : "{");
var itemTitle = (typeof key === "string" ? key + ": " : "") + (itemIsArray ? "<span class=\"jsonseparators\">[</span>" : "<span class=\"jsonseparators\">{</span>");
var itemLink = _createLink(itemTitle);
var itemsCount = _createItemsCount(itemLen);

Expand All @@ -127,7 +137,12 @@ var JSONViewer = (function(document) {
}

walkJSONTree(li, item, maxLvl, colAt, lvl + 1);
li.appendChild(document.createTextNode(itemIsArray ? "]" : "}"));

let endArrayOrHtElement = document.createElement('span');
endArrayOrHtElement.classList.add('jsonseparators');
let endArrayOrHt = document.createTextNode(itemIsArray ? "]" : "}");
endArrayOrHtElement.appendChild(endArrayOrHt);
li.appendChild(endArrayOrHtElement);

var list = li.querySelector("ul");
var itemLinkCb = function() {
Expand Down Expand Up @@ -159,7 +174,11 @@ var JSONViewer = (function(document) {

// add comma to the end
if (ind < len) {
li.appendChild(document.createTextNode(","));
let commaElement = document.createElement('span');
commaElement.classList.add('jsonseparators');
let comma = document.createTextNode(",");
commaElement.appendChild(comma);
li.appendChild(commaElement);
}

ulList.appendChild(li);
Expand All @@ -184,7 +203,11 @@ var JSONViewer = (function(document) {
}

// root cover
outputParent.appendChild(document.createTextNode(isArray ? "]" : "}"));
let veryEndArrayOrHtElement = document.createElement('span');
veryEndArrayOrHtElement.classList.add('jsonseparators');
let veryEndArrayOrHt = document.createTextNode(isArray ? "]" : "}");
veryEndArrayOrHtElement.appendChild(veryEndArrayOrHt);
outputParent.appendChild(veryEndArrayOrHtElement);

// collapse
if (isCollapse) {
Expand Down