diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js index 148a4125b..52c52592c 100644 --- a/resources/js/wysiwyg/config.js +++ b/resources/js/wysiwyg/config.js @@ -166,13 +166,13 @@ function getSetupCallback(options) { return function(editor) { editor.on('ExecCommand change input NodeChange ObjectResized', editorChange); listenForCommonEvents(editor); - registerShortcuts(editor); listenForDragAndPaste(editor, options); editor.on('init', () => { editorChange(); scrollToQueryString(editor); window.editor = editor; + registerShortcuts(editor); }); editor.on('PreInit', () => { diff --git a/resources/js/wysiwyg/shortcuts.js b/resources/js/wysiwyg/shortcuts.js index 8b51437f1..b42851a46 100644 --- a/resources/js/wysiwyg/shortcuts.js +++ b/resources/js/wysiwyg/shortcuts.js @@ -16,6 +16,8 @@ export function register(editor) { editor.shortcuts.add('meta+e', '', ['codeeditor', false, 'pre']); editor.shortcuts.add('meta+8', '', ['FormatBlock', false, 'code']); editor.shortcuts.add('meta+shift+E', '', ['FormatBlock', false, 'code']); + editor.shortcuts.add('meta+o', '', 'InsertOrderedList'); + editor.shortcuts.add('meta+p', '', 'InsertUnorderedList'); // Save draft shortcut editor.shortcuts.add('meta+S', '', () => { diff --git a/resources/views/help/wysiwyg.blade.php b/resources/views/help/wysiwyg.blade.php index 30fdc18de..8fc091258 100644 --- a/resources/views/help/wysiwyg.blade.php +++ b/resources/views/help/wysiwyg.blade.php @@ -1,10 +1,10 @@ @extends('layouts.plain') -@section('document-class', setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : '') +@section('document-class', 'bg-white ' . (setting()->getForCurrentUser('dark-mode-enabled') ? 'dark-mode ' : '')) @section('content') -
+
-

{{ trans('editor.editor_license') }}

+

{{ trans('editor.editor_license') }}

{!! trans('editor.editor_tiny_license', ['tinyLink' => 'TinyMCE']) !!}
@@ -112,7 +112,21 @@ Cmd+9 {{ trans('editor.callouts') }}
- {{ trans('editor.callouts_cycle') }} + {{ trans('editor.callouts_cycle') }} + + + + + Ctrl+O
+ Ctrl+P + + + Cmd+O
+ Cmd+P + + + {{ trans('editor.list_numbered') }}
+ {{ trans('editor.list_bullet') }}