kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'oqtane:dev' into content

Browse Source
This commit is contained in:
Tonći Vatavuk 2022-02-08 19:34:15 +01:00 committed by GitHub
commit bba5caecf7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Oqtane.Client/Modules/Controls/RichTextEditor.razor
View File

@ -87,9 +87,10 @@
private ElementReference _toolBar; private ElementReference _toolBar;
private bool _filemanagervisible = false; private bool _filemanagervisible = false;
private FileManager _fileManager; private FileManager _fileManager;
private string _rawhtml = string.Empty;
private string _richhtml = string.Empty; private string _richhtml = string.Empty;
private string _original = string.Empty; private string _originalrichhtml = string.Empty;
private string _rawhtml = string.Empty;
private string _originalrawhtml = string.Empty;
private string _message = string.Empty; private string _message = string.Empty;
[Parameter] [Parameter]
@ -123,9 +124,9 @@
protected override void OnParametersSet() protected override void OnParametersSet()
{ {
_rawhtml = Content;
_richhtml = Content; _richhtml = Content;
_original = _rawhtml; // preserve original content for comparison _rawhtml = Content;
_originalrawhtml = _rawhtml; // preserve for comparison later
} }
protected override async Task OnAfterRenderAsync(bool firstRender) protected override async Task OnAfterRenderAsync(bool firstRender)
@ -143,9 +144,16 @@
Placeholder, Placeholder,
Theme, Theme,
DebugLevel); DebugLevel);
}
await interop.LoadEditorContent(_editorElement, _richhtml); await interop.LoadEditorContent(_editorElement, _richhtml);
// preserve a copy of the rich text content (Quill sanitizes content so we need to retrieve it from the editor)
_originalrichhtml = await interop.GetHtml(_editorElement);
}
else
{
await interop.LoadEditorContent(_editorElement, _richhtml);
}
} }
public void CloseFileManager() public void CloseFileManager()
@ -170,16 +178,25 @@
public async Task<string> GetHtml() public async Task<string> GetHtml()
{ {
// return raw content if it has changed // evaluate raw html content as first priority
if (_original != _rawhtml) if (_rawhtml != _originalrawhtml)
{ {
return _rawhtml; return _rawhtml;
} }
else else
{ {
// otherwise return rich text content // return rich text content if it has changed
var interop = new RichTextEditorInterop(JSRuntime); var interop = new RichTextEditorInterop(JSRuntime);
return await interop.GetHtml(_editorElement); var richhtml = await interop.GetHtml(_editorElement);
if (richhtml != _originalrichhtml)
{
return richhtml;
}
else
{
// return original raw html content
return _originalrawhtml;
}
} }
} }