Merge branch 'master' into framework-ui

# Conflicts:
#	.github/workflows/ci.yml

Author: scambra

.github/workflows/ci.yml

@@ -91,7 +91,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ "3.4", "3.3", "3.2", "jruby-10.0" ]
+        ruby: [ "4.0", "3.4", "3.3", "3.2", "jruby-10.0" ]
         rails: [ "8.1", "8.0", "7.2" ]
         exclude:
           - ruby: 'jruby-10.0'
@@ -100,8 +100,8 @@ jobs:
           - ruby: '3.4'
             rails: '7.2'
             coverage: true
-#          - rails: '8.1'
-#            allow_failure: true
+          - ruby: '4.0'
+            allow_failure: true
     timeout-minutes: 60
     env:
       JRUBY_OPTS: "--debug"

CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+- Fix replacing tinymce fields with update_columns
+
 = 4.2.0
 - Integrate LogicalQueryParser, supporting full logical search, or simplified searches with 'all keywords' and 'any keyword' operators.
 - Display unauthorized column in form as show action, so show_ui or show override is used if exists.

README.md

@@ -13,11 +13,12 @@ ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, r
 Branch Details
 --------------
 master supports rails >= 7.2.x and ruby >= 3.2.0  
-4-1-stable supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0
+4-2-stable supports rails >= 7.2.x and ruby >= 3.2.0
 
 These versions are not supported anymore:  
-4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 2.5.0
-3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0
+4-1-stable supports rails >= 7.0.x and <= 7.2.x, and ruby >= 3.1.0  
+4-0-stable supports rails >= 6.1.x and <= 7.2.x, and ruby >= 2.5.0  
+3-7-stable supports rails >= 5.2.x and <= 7.1.x, and ruby >= 2.5.0  
 3-6-stable supports rails >= 4.2.x and <= 6.1.x, and ruby >= 2.3.0  
 3-5-stable supports rails >= 4.0.x and <= 5.1.x, and ruby >= 2.0.0  
 3-4-stable supports rails >= 3.2.x and <= 4.2.x, and ruby >= 1.9.3  

app/assets/javascripts/jquery/tiny_mce_bridge.js

@@ -7,6 +7,26 @@
     action_link_close.apply(this);
   };
 
+  ActiveScaffold.remove_tinymce = function(element) {
+    if (typeof(element) == 'string') element = '#' + element;
+    element = jQuery(element);
+    element.find('textarea.mceEditor').each(function(index, elem) {
+      tinymce.remove('#' + elem.id);
+    });
+  };
+
+  var as_replace = ActiveScaffold.replace,
+    as_replace_html = ActiveScaffold.replace_html;
+
+  ActiveScaffold.replace = function(element) {
+    this.remove_tinymce(element);
+    return as_replace.apply(this, arguments);
+  };
+  ActiveScaffold.replace_html = function(element) {
+    this.remove_tinymce(element);
+    return as_replace_html.apply(this, arguments);
+  };
+
   function loadTinyMCE() {
     var global_settings = ActiveScaffold.config.tiny_mce_settings || {};
     var local_settings = jQuery(this).data('tinymce');