Merge branch 'master' into framework-ui

Author: scambra

CHANGELOG.rdoc

@@ -19,6 +19,7 @@
 - Support action link groups to open with click, like actions showing dynamic action link group.
 - Open dynamic action link group nested in the menu tree, under the action opening it.
 - Add sort_joins to column, defaults to includes value, so it's possible to set sort by SQL without joining the includes, or join with some associations, and preload others.
+- Fix when textarea is required and uses tinymce, show the validation error if it's empty and sync the content before submitting.
 
 = 4.1.5
 - Fix update_columns global config for field search ac

app/assets/javascripts/jquery/tiny_mce_bridge.js

@@ -20,14 +20,27 @@
     var id = jQuery(this).attr('id');
     if (tinymce && tinymce.majorVersion >= 6) {
       settings.selector = '#' + id;
-      if (settings.setup) settings.setup = eval(settings.setup);
+      var userSetup = settings.setup ? eval(settings.setup) : function () {};
+      settings.setup = function(editor) {
+        userSetup(editor);                  // run what the user already had
+
+        /* keep textarea in sync */
+        var sync = function() { editor.save(); };  // same as triggerSave()
+        editor.on('change input NodeChange Undo Redo', sync);
+      };
       tinymce.init(settings);
     } else { // tinyMCE.majorVersion < 6
+      settings.init_instance_callback = function(editor) {
+        var sync = function () { editor.save(); };   // same as triggerSave()
+        editor.on('change input NodeChange Undo Redo', sync);
+        if (userInit) userInit(editor);              // run user’s callback too
+      };
       tinyMCE.settings = settings;
       tinyMCE.execCommand('mceAddEditor', false, id);
     }
   }
-
+/*const sync = () => editor.save();   // same as triggerSave for this editor
+        editor.on('change input NodeChange Undo Redo', sync);*/
   jQuery(document).on('submit', 'form.as_form', function() {
     tinymce.triggerSave();
     jQuery('textarea.mceEditor', this).each(function() { tinymce.remove('#'+jQuery(this).attr('id')); });

app/assets/stylesheets/tiny_mce_bridge.scss

@@ -0,0 +1,11 @@
+.active-scaffold textarea.mceEditor {
+  opacity: 0;
+  pointer-events: none;
+  display: inline !important;
+  height: 0;
+  margin: 0;
+  padding: 0;
+  width: 0 !important;
+  float: left;
+  margin-left: -5px;
+}

lib/active_scaffold/bridges/tiny_mce.rb

@@ -13,4 +13,8 @@ def self.install?
   def self.javascripts
     ['tinymce', 'jquery/tiny_mce_bridge']
   end
+
+  def self.stylesheets
+    ['tiny_mce_bridge']
+  end
 end