diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js index fdf8bff25..2417850c2 100644 --- a/dev/External/SquireUI.js +++ b/dev/External/SquireUI.js @@ -476,7 +476,7 @@ class SquireUI } getData() { - return trimLines(this.squire.getHTML()); + return 'source' == this.mode ? this.plain.value : trimLines(this.squire.getHTML()); } setData(html) { diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js index 2ba6b78f7..0496e9086 100644 --- a/dev/External/User/ko.js +++ b/dev/External/User/ko.js @@ -52,7 +52,7 @@ Object.assign(ko.bindingHandlers, { fUpdateEditorValue(); }; - if (ko.isObservable(fValue) && HtmlEditor) { + if (ko.isObservable(fValue)) { editor = new HtmlEditor(element, fUpdateKoValue, fOnReady, fUpdateKoValue); fValue.__fetchEditorValue = fUpdateKoValue; @@ -81,11 +81,9 @@ Object.assign(ko.bindingHandlers, { onChange: value => fValue(value) }); - if (focused) { - focused.subscribe(value => - element.addresses[value ? 'focus' : 'blur']() - ); - } + focused?.subscribe(value => + element.addresses[value ? 'focus' : 'blur']() + ); }, update: (element, fValueAccessor) => { element.addresses.value = ko.unwrap(fValueAccessor());