TinyMCE update/tweaks

nickdekruijk · Sep 25, 2020 · 0dff75a · 0dff75a
1 parent 893f322
commit 0dff75a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/config.php b/src/config.php
@@ -101,7 +101,7 @@
     | Default tinymce options for all modules, can be overruled per module
     */
     'tinymce_defaults' => [
-        'version' => '5.1.2',
+        'version' => '5.4.2',
         'theme' => 'silver',
         'formats' => "
             {title: 'H2', block: 'h2', classes: 'h2'},

diff --git a/src/css/base.css b/src/css/base.css
@@ -297,6 +297,8 @@ TABLE.report TR:hover > TD {background-color:#0cb;border-color:#0cb}
 .mce-panel {border-radius:3px}
 .mce-first {position:-webkit-sticky !important;position:sticky !important;top:-7px}
 .mce-tinymce {box-shadow:none !important;box-sizing:border-box !important}
+.tox-toolbar-overlord,
+.tox-tinymce {border-radius:3px !important;overflow:hidden}
 
 @media (min-width:651px) {
     nav.expanded ~ .fullpage {left:270px}

diff --git a/src/views/model.blade.php b/src/views/model.blade.php
@@ -130,6 +130,7 @@
         @endif
         browser_spellcheck: true,
         convert_urls : false,
+        toolbar_sticky: true,
         image_caption: true,
         file_browser_callback: function(field_name, url, type, win) {
             modelAddMedia(null, {field_name: field_name, win: win, media_url: "{{ rtrim(config('admin.media_url'), '/') }}/"});
@@ -141,7 +142,7 @@
         },
         plugins: [
             // autoresize advlist autolink link image lists hr anchor searchreplace wordcount visualblocks code table paste contextmenu save textcolor contextmenu emoticons template directionality print preview pagebreak charmap media visualchars fullscreen fullpage visualchars insertdatetime nonbreaking
-            "autoresize autolink link anchor image lists wordcount visualblocks code table paste contextmenu"
+            "autoresize autolink link anchor image lists wordcount visualblocks code table paste"
         ],
         @if ($lp->module('tinymce', 'toolbar', config('admin.tinymce_defaults')))
         toolbar: "{{ $lp->module('tinymce', 'toolbar', config('admin.tinymce_defaults')) }}",