Skip to content

Commit

Permalink
Change innerHTML to textContent
Browse files Browse the repository at this point in the history
  • Loading branch information
@tddough98
tddough98 committed Dec 18, 2020
1 parent 3dc495f commit d9bafc9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
20 changes: 10 additions & 10 deletions browser/static/js/main_track.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,34 +559,34 @@ function render_highlight_info() {
}
}
}
document.getElementById('highlight').innerHTML = highlightText;
document.getElementById('currently_highlighted').innerHTML = currentlyHighlighted;
document.getElementById('highlight').textContent = highlightText;
document.getElementById('currently_highlighted').textContent = currentlyHighlighted;
}

function render_edit_info() {
const editModeText = (edit_mode) ? 'paint mode' : 'whole-label mode';
document.getElementById('edit_mode').innerHTML = editModeText;
document.getElementById('edit_mode').textContent = editModeText;

const rowVisibility = (edit_mode) ? 'visible' : 'hidden';
document.getElementById('edit_brush_row').style.visibility = rowVisibility;
document.getElementById('brush_label_row').style.visibility = rowVisibility;
document.getElementById('edit_erase_row').style.visibility = rowVisibility;

if (edit_mode) {
document.getElementById('edit_brush').innerHTML = brush.size;
document.getElementById('edit_brush').textContent = brush.size;

const editLabelText = (brush.value > 0) ? brush.value : '-';
document.getElementById('brush_label').innerHTML = editLabelText;
document.getElementById('brush_label').textContent = editLabelText;

const editEraseText = (brush.erase && !brush.conv) ? 'ON' : 'OFF';
document.getElementById('edit_erase').innerHTML = editEraseText;
document.getElementById('edit_erase').textContent = editEraseText;
}
}

function render_cell_info() {
current_label = label_under_mouse();
if (current_label !== 0) {
document.getElementById('label').innerHTML = current_label;
document.getElementById('label').textContent = current_label;
const track = tracks[current_label.toString()];
document.getElementById('parent').textContent = track.parent || 'None';
document.getElementById('daughters').textContent = "[" + track.daughters.toString() + "]";
Expand All @@ -595,7 +595,7 @@ function render_cell_info() {
document.getElementById('capped').textContent = capped[0].toUpperCase() + capped.substring(1);
document.getElementById('frames').textContent = track.slices.toString();
} else {
document.getElementById('label').innerHTML = '';
document.getElementById('label').textContent = '';
document.getElementById('capped').textContent = '';
document.getElementById('parent').textContent = '';
document.getElementById('daughters').textContent = '';
Expand All @@ -607,7 +607,7 @@ function render_cell_info() {
// updates html display of side info panel
function render_info_display() {
// always show current frame
document.getElementById('frame').innerHTML = current_frame;
document.getElementById('frame').textContent = current_frame;

render_highlight_info();

Expand All @@ -616,7 +616,7 @@ function render_info_display() {
render_cell_info();

// always show 'state'
document.getElementById('mode').innerHTML = mode.render();
document.getElementById('mode').textContent = mode.render();
}

function render_edit_image(ctx) {
Expand Down
30 changes: 15 additions & 15 deletions browser/static/js/main_zstack.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,54 +713,54 @@ function render_highlight_info() {
}
}
}
document.getElementById('highlight').innerHTML = highlightText;
document.getElementById('currently_highlighted').innerHTML = currentlyHighlighted;
document.getElementById('highlight').textContent = highlightText;
document.getElementById('currently_highlighted').textContent = currentlyHighlighted;
}

function render_edit_info() {
const editModeText = (edit_mode) ? 'paint mode' : 'whole-label mode';
document.getElementById('edit_mode').innerHTML = editModeText;
document.getElementById('edit_mode').textContent = editModeText;

const rowVisibility = (edit_mode) ? 'visible' : 'hidden';
document.getElementById('edit_brush_row').style.visibility = rowVisibility;
document.getElementById('brush_label_row').style.visibility = rowVisibility;
document.getElementById('edit_erase_row').style.visibility = rowVisibility;

if (edit_mode) {
document.getElementById('edit_brush').innerHTML = brush.size;
document.getElementById('edit_brush').textContent = brush.size;

const editLabelText = (brush.value > 0) ? brush.value : '-';
document.getElementById('brush_label').innerHTML = editLabelText;
document.getElementById('brush_label').textContent = editLabelText;

const editEraseText = (brush.erase && !brush.conv) ? 'ON' : 'OFF';
document.getElementById('edit_erase').innerHTML = editEraseText;
document.getElementById('edit_erase').textContent = editEraseText;
}
}

function render_cell_info() {
if (canvas.label !== 0) {
document.getElementById('label').innerHTML = canvas.label;
document.getElementById('label').textContent = canvas.label;
const track = tracks[mode.feature][canvas.label.toString()];
document.getElementById('slices').textContent = track.slices.toString();
} else {
document.getElementById('label').innerHTML = '';
document.getElementById('label').textContent = '';
document.getElementById('slices').textContent = '';
}
}

// updates html display of side info panel
function render_info_display() {
// always show current frame, feature, channel
document.getElementById('frame').innerHTML = current_frame;
document.getElementById('feature').innerHTML = mode.feature;
document.getElementById('channel').innerHTML = mode.channel;
document.getElementById('zoom').innerHTML = `${canvas.zoom}%`;
document.getElementById('frame').textContent = current_frame;
document.getElementById('feature').textContent = mode.feature;
document.getElementById('channel').textContent = mode.channel;
document.getElementById('zoom').textContent = `${canvas.zoom}%`;

const displayedX = `${Math.floor(canvas.sx)}-${Math.ceil(canvas.sx + canvas.sWidth)}`;
document.getElementById('displayedX').innerHTML = displayedX;
document.getElementById('displayedX').textContent = displayedX;

const displayedY = `${Math.floor(canvas.sy)}-${Math.ceil(canvas.sy + canvas.sHeight)}`
document.getElementById('displayedY').innerHTML = displayedY;
document.getElementById('displayedY').textContent = displayedY;

render_highlight_info();

Expand All @@ -769,7 +769,7 @@ function render_info_display() {
render_cell_info();

// always show 'state'
document.getElementById('mode').innerHTML = mode.render();
document.getElementById('mode').textContent = mode.render();
}

function render_edit_image(ctx) {
Expand Down

0 comments on commit d9bafc9

Please sign in to comment.