Commit 2ea72065 authored by Dong Hwi Lee's avatar Dong Hwi Lee Committed by Commit Bot

Use shorter and simpler IDs/style names in DocumentXMLTreeViewer.

Name changes:
 - Collapse -> Fold (name borrowed form wikipedia/Code_folding)
 - Collapsible -> Folder
 - Collapsed -> Folded
 - Expanded -> Opened
 - collapse-button (in CSS) -> fold
 - expand-button (in CSS) -> open

Improvements:
 - Remove createButton (only referenced by createCollapsibleButton).
 - Remove 'text' class as it's not actually used.

Change-Id: I29899a9293be47764f1963f7683cdd313622deef
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2070968
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744176}
parent 1df2e8e9
...@@ -9,11 +9,11 @@ div.header { ...@@ -9,11 +9,11 @@ div.header {
margin: 10px; margin: 10px;
} }
div.collapsible > div.hidden { div.folder > div.hidden {
display:none; display:none;
} }
div.collapsible > span.hidden { div.folder > span.hidden {
display:none; display:none;
} }
...@@ -28,7 +28,7 @@ div.collapsible > span.hidden { ...@@ -28,7 +28,7 @@ div.collapsible > span.hidden {
display: none; display: none;
} }
.expanded-content { .opened {
margin-left: 1em; margin-left: 1em;
} }
...@@ -36,7 +36,7 @@ div.collapsible > span.hidden { ...@@ -36,7 +36,7 @@ div.collapsible > span.hidden {
white-space: pre; white-space: pre;
} }
.collapsible-button { .folder-button {
-webkit-user-select: none; -webkit-user-select: none;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
...@@ -47,12 +47,12 @@ div.collapsible > span.hidden { ...@@ -47,12 +47,12 @@ div.collapsible > span.hidden {
vertical-align: bottom; vertical-align: bottom;
} }
.collapse-button { .fold {
background: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23909090' width='10' height='10'><path d='M0 0 L8 0 L4 7 Z'/></svg>"); background: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23909090' width='10' height='10'><path d='M0 0 L8 0 L4 7 Z'/></svg>");
height: 10px; height: 10px;
} }
.expand-button { .open {
background: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23909090' width='10' height='10'><path d='M0 0 L0 8 L7 4 Z'/></svg>"); background: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='%23909090' width='10' height='10'><path d='M0 0 L0 8 L7 4 Z'/></svg>");
height: 10px; height: 10px;
} }
...@@ -115,15 +115,15 @@ function processShortTextOnlyElement(parentElement, node) ...@@ -115,15 +115,15 @@ function processShortTextOnlyElement(parentElement, node)
function processComplexElement(parentElement, node) function processComplexElement(parentElement, node)
{ {
var collapsible = createCollapsible(); var folder = createFolder();
collapsible.start.appendChild(createTag(node, false, false)); folder.start.appendChild(createTag(node, false, false));
for (var child = node.firstChild; child; child = child.nextSibling) for (var child = node.firstChild; child; child = child.nextSibling)
processNode(collapsible.expandedContent, child); processNode(folder.openedContent, child);
collapsible.end.appendChild(createTag(node, true, false)); folder.end.appendChild(createTag(node, true, false));
parentElement.appendChild(collapsible); parentElement.appendChild(folder);
} }
function processComment(parentElement, node) function processComment(parentElement, node)
...@@ -133,13 +133,13 @@ function processComment(parentElement, node) ...@@ -133,13 +133,13 @@ function processComment(parentElement, node)
line.appendChild(createComment('<!-- ' + node.nodeValue + ' -->')); line.appendChild(createComment('<!-- ' + node.nodeValue + ' -->'));
parentElement.appendChild(line); parentElement.appendChild(line);
} else { } else {
var collapsible = createCollapsible(); var folder = createFolder();
collapsible.start.appendChild(createComment('<!--')); folder.start.appendChild(createComment('<!--'));
collapsible.expandedContent.appendChild(createComment(node.nodeValue)); folder.openedContent.appendChild(createComment(node.nodeValue));
collapsible.end.appendChild(createComment('-->')); folder.end.appendChild(createComment('-->'));
parentElement.appendChild(collapsible); parentElement.appendChild(folder);
} }
} }
...@@ -150,12 +150,12 @@ function processCDATA(parentElement, node) ...@@ -150,12 +150,12 @@ function processCDATA(parentElement, node)
line.appendChild(createText('<![CDATA[ ' + node.nodeValue + ' ]]>')); line.appendChild(createText('<![CDATA[ ' + node.nodeValue + ' ]]>'));
parentElement.appendChild(line); parentElement.appendChild(line);
} else { } else {
var collapsible = createCollapsible(); var folder = createFolder();
collapsible.start.appendChild(createText('<![CDATA[')); folder.start.appendChild(createText('<![CDATA['));
collapsible.expandedContent.appendChild(createText(node.nodeValue)); folder.openedContent.appendChild(createText(node.nodeValue));
collapsible.end.appendChild(createText(']]>')); folder.end.appendChild(createText(']]>'));
parentElement.appendChild(collapsible); parentElement.appendChild(folder);
} }
} }
...@@ -166,13 +166,13 @@ function processProcessingInstruction(parentElement, node) ...@@ -166,13 +166,13 @@ function processProcessingInstruction(parentElement, node)
line.appendChild(createComment('<?' + node.nodeName + ' ' + node.nodeValue + '?>')); line.appendChild(createComment('<?' + node.nodeName + ' ' + node.nodeValue + '?>'));
parentElement.appendChild(line); parentElement.appendChild(line);
} else { } else {
var collapsible = createCollapsible(); var folder = createFolder();
collapsible.start.appendChild(createComment('<?' + node.nodeName)); folder.start.appendChild(createComment('<?' + node.nodeName));
collapsible.expandedContent.appendChild(createComment(node.nodeValue)); folder.openedContent.appendChild(createComment(node.nodeValue));
collapsible.end.appendChild(createComment('?>')); folder.end.appendChild(createComment('?>'));
parentElement.appendChild(collapsible); parentElement.appendChild(folder);
} }
} }
...@@ -195,42 +195,35 @@ function createHTMLElement(elementName) ...@@ -195,42 +195,35 @@ function createHTMLElement(elementName)
return document.createElementNS('http://www.w3.org/1999/xhtml', elementName) return document.createElementNS('http://www.w3.org/1999/xhtml', elementName)
} }
function createCollapsible() function createFolder()
{ {
var collapsible = createHTMLElement('div'); var folder = createHTMLElement('div');
collapsible.classList.add('collapsible'); folder.classList.add('folder');
collapsible.start = createLine(); folder.start = createLine();
collapsible.start.appendChild(createCollapsibleButton()); folder.start.appendChild(createFolderButton());
collapsible.appendChild(collapsible.start); folder.appendChild(folder.start);
collapsible.expandedContent = createHTMLElement('div'); folder.openedContent = createHTMLElement('div');
collapsible.expandedContent.classList.add('expanded-content'); folder.openedContent.classList.add('opened');
collapsible.appendChild(collapsible.expandedContent); folder.appendChild(folder.openedContent);
// Collapsed content. // Folded content.
collapsible.collapsedContent = createText('...'); folder.foldedContent = createText('...');
collapsible.collapsedContent.classList.add('collapsed-content'); folder.foldedContent.classList.add('folded');
collapsible.collapsedContent.classList.add('hidden'); folder.foldedContent.classList.add('hidden');
collapsible.appendChild(collapsible.collapsedContent); folder.appendChild(folder.foldedContent);
collapsible.end = createLine(); folder.end = createLine();
collapsible.appendChild(collapsible.end); folder.appendChild(folder.end);
return collapsible; return folder;
} }
function createButton() function createFolderButton(str) {
{
var button = createHTMLElement('span'); var button = createHTMLElement('span');
button.classList.add('button'); button.classList.add('folder-button');
return button; button.classList.add('fold');
}
function createCollapsibleButton(str) {
var button = createButton();
button.classList.add('collapsible-button');
button.classList.add('collapse-button');
return button; return button;
} }
...@@ -247,7 +240,6 @@ function createText(value) ...@@ -247,7 +240,6 @@ function createText(value)
{ {
var text = createHTMLElement('span'); var text = createHTMLElement('span');
text.textContent = value; text.textContent = value;
text.classList.add('text');
return text; return text;
} }
...@@ -313,46 +305,46 @@ function createAttribute(attributeNode) ...@@ -313,46 +305,46 @@ function createAttribute(attributeNode)
function toggleFunction(sectionId) { function toggleFunction(sectionId) {
return function() { return function() {
var collapsedContent = var foldedContent =
document.querySelector('#' + sectionId + ' > .collapsed-content'); document.querySelector('#' + sectionId + ' > .folded');
var expandedContent = var openedContent =
document.querySelector('#' + sectionId + ' > .expanded-content'); document.querySelector('#' + sectionId + ' > .opened');
var collapsible_button = document.querySelector( var folderButton = document.querySelector(
'#' + sectionId + ' > .line > .collapsible-button'); '#' + sectionId + ' > .line > .folder-button');
if (collapsedContent) { if (foldedContent) {
if (collapsedContent.className.includes('hidden')) if (foldedContent.className.includes('hidden'))
collapsedContent.className = 'collapsed-content'; foldedContent.className = 'folded';
else else
collapsedContent.className = 'collapsed-content hidden'; foldedContent.className = 'folded hidden';
} }
if (expandedContent) { if (openedContent) {
if (expandedContent.className.includes('hidden')) if (openedContent.className.includes('hidden'))
expandedContent.className = 'expanded-content'; openedContent.className = 'opened';
else else
expandedContent.className = 'expanded-content hidden'; openedContent.className = 'opened hidden';
} }
if (collapsible_button) { if (folderButton) {
if (collapsible_button.className.includes('expand-button')) if (folderButton.className.includes('open'))
collapsible_button.className = 'collapsible-button collapse-button'; folderButton.className = 'folder-button fold';
else else
collapsible_button.className = 'collapsible-button expand-button'; folderButton.className = 'folder-button open';
} }
}; };
} }
function initButtons() function initButtons()
{ {
var sections = document.querySelectorAll('.collapsible'); var sections = document.querySelectorAll('.folder');
for (var i = 0; i < sections.length; i++) { for (var i = 0; i < sections.length; i++) {
var sectionId = 'collapsible' + i; var sectionId = 'folder' + i;
sections[i].id = sectionId; sections[i].id = sectionId;
var collapseButton = sections[i].querySelector('.collapsible-button'); var folderButton = sections[i].querySelector('.folder-button');
collapseButton.onclick = toggleFunction(sectionId); folderButton.onclick = toggleFunction(sectionId);
collapseButton.onmousedown = handleButtonMouseDown; folderButton.onmousedown = handleButtonMouseDown;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment