Added ordered/unordered WYSIWYG list shortcuts

Related to #1269

diff --git a/resources/js/wysiwyg/config.js b/resources/js/wysiwyg/config.js
index 148a4125b52226aed146aeb570e35bbe3ebe4015..52c52592cb720fab6a235a5d04ea4902cbf89515 100644 (file)
--- 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);
     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;
         listenForDragAndPaste(editor, options);
 
         editor.on('init', () => {
             editorChange();
             scrollToQueryString(editor);
             window.editor = editor;

+            registerShortcuts(editor);

         });
 
         editor.on('PreInit', () => {
         });
 
         editor.on('PreInit', () => {

diff --git a/resources/js/wysiwyg/shortcuts.js b/resources/js/wysiwyg/shortcuts.js
index 8b51437f1d811959afba20ed9b766b4c98b44c5e..b42851a46588b7274b9feec28fee13db704fea4d 100644 (file)
--- 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+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', '', () => {
 
     // 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 30fdc18de8a071c91980a87f2e9900f05bc7fe5e..8fc0912586d5000fbb883e61c62d6666545d5cd6 100644 (file)
--- a/resources/views/help/wysiwyg.blade.php
+++ b/resources/views/help/wysiwyg.blade.php
@@ -1,10 +1,10 @@
 @extends('layouts.plain')
 @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')
 
 @section('content')

-    <div class="px-l pb-m m-s card">
+    <div class="p-m">

 
 

-        <h4>{{ trans('editor.editor_license') }}</h4>
+        <h4 class="mt-s">{{ trans('editor.editor_license') }}</h4>

         <p>
             {!! trans('editor.editor_tiny_license', ['tinyLink' => '<a href="https://www.tiny.cloud/" target="_blank" rel="noopener noreferrer">TinyMCE</a>']) !!}
             <br>
         <p>
             {!! trans('editor.editor_tiny_license', ['tinyLink' => '<a href="https://www.tiny.cloud/" target="_blank" rel="noopener noreferrer">TinyMCE</a>']) !!}
             <br>


@@ -112,7 +112,21 @@
                 <td><code>Cmd</code>+<code>9</code></td>
                 <td>
                     {{ trans('editor.callouts') }} <br>
                 <td><code>Cmd</code>+<code>9</code></td>
                 <td>
                     {{ trans('editor.callouts') }} <br>

-                    {{ trans('editor.callouts_cycle') }}
+                    <small>{{ trans('editor.callouts_cycle') }}</small>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <code>Ctrl</code>+<code>O</code> <br>
+                    <code>Ctrl</code>+<code>P</code>
+                </td>
+                <td>
+                    <code>Cmd</code>+<code>O</code> <br>
+                    <code>Cmd</code>+<code>P</code>
+                </td>
+                <td>
+                    {{ trans('editor.list_numbered') }} <br>
+                    {{ trans('editor.list_bullet') }}

                 </td>
             </tr>
             <tr>
                 </td>
             </tr>
             <tr>