Update TinyMCE and fix configuration loading

samvera · Sep 14, 2021 · 095a2b5 · 095a2b5
1 parent 426575a
commit 095a2b5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.dassie/config/tinymce.yml b/.dassie/config/tinymce.yml
@@ -0,0 +1,13 @@
+default: &default
+  setup: tinymce_nav_safety # onChange event init
+content_block:
+  <<: *default
+  menubar: false
+  toolbar1: styleselect | bold italic | undo redo
+  toolbar2: table | fullscreen | image
+  plugins:
+    - table
+    - fullscreen
+    - image
+custom:
+  <<: *default
diff --git a/app/assets/javascripts/hyrax.js b/app/assets/javascripts/hyrax.js
@@ -30,6 +30,7 @@
 //= require morris/morris.min
 
 //= require clipboard
+//= require tinymce
 
 // This is required for Jasmine tests, specifically to polyfill the Symbol() function
 //= require babel/polyfill

diff --git a/app/assets/javascripts/hyrax/app.js.erb b/app/assets/javascripts/hyrax/app.js.erb
@@ -18,22 +18,12 @@ Hyrax = {
         this.collectionTypeEditor();
         this.collectionUtilities();
         this.adminStatisticsGraphs();
-        this.tinyMCE();
         this.sortAndPerPage();
         this.sidebar();
         this.batchSelect();
         this.internationalizationHelper();
     },
 
-    // Add WYSIWYG editor functionality to editable content blocks
-    tinyMCE: function() {
-        if (typeof tinyMCE === "undefined")
-            return;
-        tinyMCE.init({
-            selector: 'textarea.tinymce'
-        });
-    },
-
     // The AdminSet edit page
     adminSetEditor: function() {
       var AdminSetControls = require('hyrax/admin/admin_set_controls');

diff --git a/app/views/layouts/_head_tag_content.html.erb b/app/views/layouts/_head_tag_content.html.erb
@@ -22,7 +22,7 @@ signed in %>
 
 <!-- application js -->
 <%= javascript_include_tag 'application' %>
-<%= tinymce_assets if can? :update, ContentBlock %>
+
 <%= render 'shared/appearance_styles' %>
 
 <!-- Google Analytics -->

diff --git a/lib/generators/hyrax/templates/config/tinymce.yml b/lib/generators/hyrax/templates/config/tinymce.yml
@@ -3,10 +3,11 @@ default: &default
 content_block:
   <<: *default
   menubar: false
-  toolbar1: styleselect | bold italic | link image | undo redo
-  toolbar2: table | fullscreen | uploadimage
+  toolbar1: styleselect | bold italic | undo redo
+  toolbar2: table | fullscreen | image
   plugins:
     - table
     - fullscreen
+    - image
 custom:
   <<: *default
diff --git a/lib/hyrax/engine.rb b/lib/hyrax/engine.rb
@@ -13,6 +13,7 @@ class Engine < ::Rails::Engine
     require 'flipflop'
     require 'qa'
     require 'clipboard/rails'
+    require 'tinymce-rails'
     require 'legato'
     require 'pul_uv_rails'