Skip to content
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

Change contenteditable "true" to "plaintext-only" #1650

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Change contenteditable "true" to "plaintext-only" #1650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5aca165
Convert to string if number bigger than max safe int
pawfrolow Mar 11, 2025
a639d83
Changed contenteditable to plaintext-only to escape html paste
pawfrolow Mar 11, 2025
a8df505
Revert "Convert to string if number bigger than max safe int"
pawfrolow Mar 13, 2025
5e71b41
fallback for support plaintext-only & fix
pawfrolow Mar 21, 2025
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 examples/css/darktheme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ tr.jsoneditor-selected {
}

div.jsoneditor-field[contenteditable=true]:focus,
div.jsoneditor-field[contenteditable=plaintext-only]:focus,
div.jsoneditor-field[contenteditable=true]:hover,
div.jsoneditor-field[contenteditable=plaintext-only]:hover,
div.jsoneditor-value[contenteditable=true]:focus,
div.jsoneditor-value[contenteditable=plaintext-only]:focus,
div.jsoneditor-value[contenteditable=true]:hover,
div.jsoneditor-value[contenteditable=plaintext-only]:hover,
div.jsoneditor-field.jsoneditor-highlight,
div.jsoneditor-value.jsoneditor-highlight {
background-color: #808080;
Expand Down
19 changes: 17 additions & 2 deletions src/js/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2235,7 +2235,7 @@ export class Node {
if (domField) {
if (this.fieldEditable) {
// parent is an object
domField.contentEditable = this.editable.field
setContentEditable(domField, this.editable.field)
domField.spellcheck = false
domField.className = 'jsoneditor-field'
} else {
Expand Down Expand Up @@ -2428,7 +2428,7 @@ export class Node {
} else {
// create an editable or read-only div
domValue = document.createElement('div')
domValue.contentEditable = this.editable.value
setContentEditable(domValue, this.editable.value)
domValue.spellcheck = false
domValue.innerHTML = this._escapeHTML(this.value)
}
Expand Down Expand Up @@ -4775,6 +4775,21 @@ function getField (node) {
function hasOwnProperty (object, key) {
return Object.prototype.hasOwnProperty.call(object, key)
}
/**
* Safe way to set "contentEditable"
* @param {HTMLElement} div
* @param {boolean} enable
*/
function setContentEditable (element, enable) {
if (element) {
try {
element.contentEditable = enable ? 'plaintext-only' : false
} catch {
// fallback for browsers not supporting 'plaintext-only'
element.contentEditable = enable
}
}
}

// TODO: find a nicer solution to resolve this circular dependency between Node and AppendNode
// idea: introduce properties .isAppendNode and .isNode and use that instead of instanceof AppendNode checks
Expand Down
2 changes: 1 addition & 1 deletion src/js/treemode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ treemode.getName = function () {
* - to the first button in the top menu
*/
treemode.focus = function () {
let input = this.scrollableContent.querySelector('[contenteditable=true]')
let input = this.scrollableContent.querySelector('[contenteditable=plaintext-only]') || this.scrollableContent.querySelector('[contenteditable=true]')
if (input) {
input.focus()
} else if (this.node.dom.expand) {
Expand Down
4 changes: 4 additions & 0 deletions src/scss/jsoneditor/_editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,13 @@ a.jsoneditor-value.jsoneditor-url:focus {
color: variables.$jse-number;
}
div.jsoneditor-field[contenteditable="true"]:focus,
div.jsoneditor-field[contenteditable="plaintext-only"]:focus,
div.jsoneditor-field[contenteditable="true"]:hover,
div.jsoneditor-field[contenteditable="plaintext-only"]:hover,
div.jsoneditor-value[contenteditable="true"]:focus,
div.jsoneditor-value[contenteditable="plaintext-only"]:focus,
div.jsoneditor-value[contenteditable="true"]:hover,
div.jsoneditor-value[contenteditable="plaintext-only"]:hover,
div.jsoneditor-field.jsoneditor-highlight,
div.jsoneditor-value.jsoneditor-highlight {
background-color: variables.$jse-busy;
Expand Down