From bee8537a91ffd9d22e3b6a98b35719958c8cffae Mon Sep 17 00:00:00 2001 From: undefined Date: Sun, 18 Apr 2021 20:58:29 +0800 Subject: [PATCH] =?UTF-8?q?ui:=20=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E6=A8=A1=E5=BC=8F=E5=81=8F=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui-default/components/cmeditor/index.js | 2 +- .../ui-default/components/cmeditor/textareaHandler.js | 2 +- packages/ui-default/package.json | 2 +- packages/ui-default/setting.yaml | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/ui-default/components/cmeditor/index.js b/packages/ui-default/components/cmeditor/index.js index b9cc0cd8a..f8fefb4d7 100644 --- a/packages/ui-default/components/cmeditor/index.js +++ b/packages/ui-default/components/cmeditor/index.js @@ -9,7 +9,7 @@ export const config = { 'upload', 'record', '|', 'edit-mode', 'content-theme', 'code-theme', 'export', 'preview', ], - mode: 'ir', + mode: UserContext.preferedEditorType || 'ir', toolbarConfig: { pin: true, }, diff --git a/packages/ui-default/components/cmeditor/textareaHandler.js b/packages/ui-default/components/cmeditor/textareaHandler.js index c959c4d83..6ea2ea1d8 100644 --- a/packages/ui-default/components/cmeditor/textareaHandler.js +++ b/packages/ui-default/components/cmeditor/textareaHandler.js @@ -11,7 +11,7 @@ export default class TextareaHandler extends DOMAttachedObject { isCmEditor() { const editor = this.getCmEditor(); - return (editor !== undefined && editor.isValid()); + return (editor && editor.isValid); } val(...argv) { diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index a27ffa0c0..2eb52a9ed 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.6.3", + "version": "4.6.4", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/setting.yaml b/packages/ui-default/setting.yaml index b373401bd..2f5f4dab8 100644 --- a/packages/ui-default/setting.yaml +++ b/packages/ui-default/setting.yaml @@ -81,6 +81,14 @@ lang_monaco_modes: go: go rb: ruby jl: julia +preferedEditorType: + type: + wysiwyg: WYSIWYG + ir: Instant Rendering + sv: Split View + family: markdown + category: preference + value: ir showInvisibleChar: type: boolean family: highlight