active_scaffold_vho 3.0.21 → 3.0.22

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.21"
+  s.version = "3.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-09-23}
+  s.date = %q{2011-10-22}
   s.description = %q{Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [
@@ -154,6 +154,8 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/bridges/shared/date_bridge.rb",
     "lib/active_scaffold/bridges/tiny_mce/bridge.rb",
     "lib/active_scaffold/bridges/tiny_mce/lib/tiny_mce_bridge.rb",
+    "lib/active_scaffold/bridges/tiny_mce/public/javascripts/jquery/tiny_mce_bridge.js",
+    "lib/active_scaffold/bridges/tiny_mce/public/javascripts/prototype/tiny_mce_bridge.js",
     "lib/active_scaffold/bridges/validation_reflection/bridge.rb",
     "lib/active_scaffold/bridges/validation_reflection/lib/validation_reflection_bridge.rb",
     "lib/active_scaffold/config/base.rb",

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -239,6 +239,16 @@ $(document).ready(function() {
     });
     return true;
   });
+  $('form.as_form').live('ajax:before', function(event) {
+    var as_form = $(this).closest("form");
+    $(this).trigger('as:form_submit');
+    return true;
+  });
+  $('form.as_form[data-remote!="true"]').live('submit', function(event) {
+    var as_form = $(this).closest("form");
+    $(this).trigger('as:form_submit');
+    return true;
+  });
   ActiveScaffold.trigger_load_events($('[data-as_load]'));
   
 });
@@ -446,6 +456,7 @@ var ActiveScaffold = {
   replace: function(element, html) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = $(element);
+    ActiveScaffold.trigger_unload_events(element.find('[data-as_load]').andSelf());
     element.replaceWith(html);
     if (element.attr('id')) {
       element = $('#' + element.attr('id'));
@@ -457,6 +468,7 @@ var ActiveScaffold = {
   replace_html: function(element, html) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = $(element);
+    ActiveScaffold.trigger_unload_events(element.find('[data-as_load]'));
     element.html(html);
     ActiveScaffold.trigger_load_events(element.find('[data-as_load]'));
     return element;
@@ -659,6 +671,7 @@ var ActiveScaffold = {
 
     if (element) {
       if (options.is_subform == false) {
+        ActiveScaffold.trigger_unload_events(element.closest('li.form-element'));
         this.replace(element.closest('dl'), content);
         ActiveScaffold.trigger_load_events(element.closest('li.form-element'));
       } else {
@@ -792,6 +805,22 @@ var ActiveScaffold = {
        break;
       }
     });
+  },
+
+  trigger_unload_events: function(elements){
+    elements.each(function(index) {
+      switch ($(this).attr('data-as_load')) {
+      case 'tr':
+       $(this).trigger('as:list_row_unloaded');
+       break;
+      case 'form':
+       $(this).trigger('as:form_unloaded');
+       break;
+      case 'form-element':
+       $(this).trigger('as:form_element_unloaded');
+       break;
+      }
+    });
   }
 }
 
@@ -906,6 +935,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
 
   close: function() {
     this.enable();
+    ActiveScaffold.trigger_unload_events(this.adapter.find('[data-as_load]'));
     this.adapter.remove();
     if (this.hide_target) this.target.show();
   },
@@ -977,6 +1007,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     $.each(this.set.links, function(index, item) {
       if (item.url != _this.url && item.is_disabled() && item.adapter) {
         item.enable();
+        ActiveScaffold.trigger_unload_events(item.adapter.find('[data-as_load]'));
         item.adapter.remove();
       }
     });

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -314,6 +314,16 @@ document.observe("dom:loaded", function() {
       ActiveScaffold.focus_first_element_of_form(as_form);
       return true;
   });
+  document.on('ajax:before', 'form.as_form', function(event) {
+    var as_form = event.findElement('form');
+    element.fire('as:form_submit');
+    return true;
+  });
+  document.on('submit', 'form.as_form[data-remote!="true"]', function(event) {
+    var as_form = event.findElement('form');
+    element.fire('as:form_submit');
+    return true;
+  });
   ActiveScaffold.trigger_load_events($$('[data-as_load]'));
 });
 
@@ -397,10 +407,13 @@ var ActiveScaffold = {
   },
   
   replace: function(element, html) {
-    element = $(element)
+    element = $(element);
+    var elements = element.select('[data-as_load]');
+    elements.unshift(element);
+    ActiveScaffold.trigger_unload_events(elements);
     Element.replace(element, html);
     element = $(element.readAttribute('id'));
-    var elements = element.select('[data-as_load]');
+    elements = element.select('[data-as_load]');
     elements.unshift(element);
     ActiveScaffold.trigger_load_events(elements);
     return element;
@@ -408,6 +421,7 @@ var ActiveScaffold = {
     
   replace_html: function(element, html) {
     element = $(element);
+    ActiveScaffold.trigger_unload_events(element.select('[data-as_load]'));
     element.update(html);
     ActiveScaffold.trigger_load_events(element.select('[data-as_load]'));
     return element;
@@ -590,6 +604,7 @@ var ActiveScaffold = {
 
     if (element) {
       if (options.is_subform == false) {
+        ActiveScaffold.trigger_unload_events(new Array(element.up('li.form-element')));
         this.replace(element.up('dl'), content);
         ActiveScaffold.trigger_load_events(new Array(element.up('li.form-element')));
       } else {
@@ -647,6 +662,22 @@ var ActiveScaffold = {
        break;
       }
     });
+  },
+
+  trigger_unload_events: function(elements){
+    elements.each(function(element) {
+      switch (element.readAttribute('data-as_load')) {
+      case 'tr':
+       element.fire('as:list_row_unloaded');
+       break;
+      case 'form':
+       element.fire('as:form_unloaded');
+       break;
+      case 'form-element':
+       element.fire('as:form_element_unloaded');
+       break;
+      }
+    });
   }
 
 }
@@ -796,6 +827,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
 
   close: function() {
     this.enable();
+    ActiveScaffold.trigger_unload_events(this.adapter.select('[data-as_load]'));
     this.adapter.remove();
     if (this.hide_target) this.target.show();
   },
@@ -866,6 +898,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     this.set.links.each(function(item) {
       if (item.url != this.url && item.is_disabled() && item.adapter) {
         item.enable();
+        ActiveScaffold.trigger_unload_events(item.adapter.select('[data-as_load]'));
         item.adapter.remove();
       }
     }.bind(this));

data/frontends/default/views/_base_form.html.erb

@@ -2,7 +2,11 @@
    xhr = request.xhr? if xhr.nil?
    if active_scaffold_config.actions.include? form_action
      multipart ||= active_scaffold_config.send(form_action).multipart?
-     columns ||= active_scaffold_config.send(form_action).columns
+     columns ||= if respond_to?("#{form_action}_columns")
+         self.send("#{form_action}_columns")
+       else
+         active_scaffold_config.send(form_action).columns
+       end
    else
      multipart ||= false
      columns ||= nil

data/lib/active_scaffold/actions/core.rb

@@ -150,7 +150,7 @@ module ActiveScaffold::Actions
         params = params[:record] || {} unless params[model.inheritance_column] # in create action must be inside record key
         model = params.delete(model.inheritance_column).camelize.constantize if params[model.inheritance_column]
       end
-      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+      model.new(build_options || {})
     end
 
     private

data/lib/active_scaffold/actions/create.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Actions
       base.verify :method => :post,
                   :only => :create,
                   :redirect_to => { :action => :index }
+      base.helper_method :create_columns
     end
 
     def new
@@ -69,15 +70,15 @@ module ActiveScaffold::Actions
     end
 
     def create_respond_to_xml
-      render :xml => response_object.to_xml(:only => active_scaffold_config.create.columns.names), :content_type => Mime::XML, :status => response_status, :location => response_location
+      render :xml => response_object.to_xml(:only => create_columns_names), :content_type => Mime::XML, :status => response_status, :location => response_location
     end
 
     def create_respond_to_json
-      render :text => response_object.to_json(:only => active_scaffold_config.create.columns.names), :content_type => Mime::JSON, :status => response_status, :location => response_location
+      render :text => response_object.to_json(:only => create_columns_names), :content_type => Mime::JSON, :status => response_status, :location => response_location
     end
 
     def create_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.create.columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status, :location => response_location
+      render :text => Hash.from_xml(response_object.to_xml(:only => create_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status, :location => response_location
     end
 
     # A simple method to find and prepare an example new record for the form
@@ -97,7 +98,7 @@ module ActiveScaffold::Actions
     def do_create
       begin
         active_scaffold_config.model.transaction do
-          @record = update_record_from_params(new_model, active_scaffold_config.create.columns, params[:record])
+          @record = update_record_from_params(new_model, create_columns, params[:record])
           apply_constraints_to_record(@record, :allow_autosave => true)
           if nested?
             create_association_with_parent(@record) 
@@ -134,16 +135,27 @@ module ActiveScaffold::Actions
     def create_authorized?
       (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :create)
     end
-    private
-    def create_authorized_filter
-      link = active_scaffold_config.create.link || active_scaffold_config.create.class.link
-      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
-    end
+
     def new_formats
       (default_formats + active_scaffold_config.formats).uniq
     end
     def create_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.create.formats).uniq
     end
+
+    def create_columns
+      active_scaffold_config.create.columns
+    end
+
+    def create_columns_names
+      update_columns.collect(&:name)
+    end
+    
+    private
+    def create_authorized_filter
+      link = active_scaffold_config.create.link || active_scaffold_config.create.class.link
+      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
+    end
+    
   end
 end

data/lib/active_scaffold/actions/delete.rb

@@ -63,13 +63,15 @@ module ActiveScaffold::Actions
     def delete_authorized?(record = nil)
       (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :delete)
     end
+
+    def destroy_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.delete.formats).uniq
+    end
     private
     def delete_authorized_filter
       link = active_scaffold_config.delete.link || active_scaffold_config.delete.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
-    def destroy_formats
-      (default_formats + active_scaffold_config.formats + active_scaffold_config.delete.formats).uniq
-    end
+    
   end
 end

data/lib/active_scaffold/actions/field_search.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Actions
       base.before_filter :store_search_params_into_session, :only => [:index]
       base.before_filter :do_search, :only => [:index]
       base.helper_method :field_search_params
+      base.helper_method :field_search_columns
     end
 
     # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations.
@@ -46,7 +47,7 @@ module ActiveScaffold::Actions
         text_search = active_scaffold_config.field_search.text_search
         search_conditions = []
         human_condition_columns = [] if active_scaffold_config.field_search.human_conditions
-        columns = active_scaffold_config.field_search.columns
+        columns = field_search_columns
         search_params.each do |key, value|
           next unless columns.include? key
           search_condition = self.class.condition_for_column(active_scaffold_config.columns[key], value, text_search)
@@ -69,14 +70,24 @@ module ActiveScaffold::Actions
       end
     end
 
+    def field_search_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq
+    end
+
+    def field_search_columns
+      active_scaffold_config.field_search.columns
+    end
+
+    def field_search_names
+      field_search_columns.collect(&:name)
+    end
+
     private
     
     def search_authorized_filter
       link = active_scaffold_config.field_search.link || active_scaffold_config.field_search.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
-    def field_search_formats
-      (default_formats + active_scaffold_config.formats + active_scaffold_config.field_search.formats).uniq
-    end
+    
   end
 end

data/lib/active_scaffold/actions/list.rb

@@ -162,11 +162,6 @@ module ActiveScaffold::Actions
     def action_update_respond_to_yaml
       render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
-     
-    private
-    def list_authorized_filter
-      raise ActiveScaffold::ActionNotAllowed unless list_authorized?
-    end
 
     def list_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
@@ -181,6 +176,11 @@ module ActiveScaffold::Actions
       (default_formats + active_scaffold_config.formats).uniq
     end
 
+    private
+    def list_authorized_filter
+      raise ActiveScaffold::ActionNotAllowed unless list_authorized?
+    end
+
     def list_columns
       active_scaffold_config.list.columns.collect_visible
     end

data/lib/active_scaffold/actions/search.rb

@@ -35,13 +35,13 @@ module ActiveScaffold::Actions
       end
     end
 
+    def search_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq
+    end
     private
     def search_authorized_filter
       link = active_scaffold_config.search.link || active_scaffold_config.search.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
-    def search_formats
-      (default_formats + active_scaffold_config.formats + active_scaffold_config.search.formats).uniq
-    end
   end
 end

data/lib/active_scaffold/actions/show.rb

@@ -2,6 +2,7 @@ module ActiveScaffold::Actions
   module Show
     def self.included(base)
       base.before_filter :show_authorized_filter, :only => :show
+      base.helper_method :show_columns
     end
 
     def show
@@ -20,15 +21,15 @@ module ActiveScaffold::Actions
     protected
     
     def show_respond_to_json
-      render :text => response_object.to_json(:only => active_scaffold_config.show.columns.names), :content_type => Mime::JSON, :status => response_status
+      render :text => response_object.to_json(:only => show_columns_names), :content_type => Mime::JSON, :status => response_status
     end
 
     def show_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.show.columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      render :text => Hash.from_xml(response_object.to_xml(:only => show_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
 
     def show_respond_to_xml
-      render :xml => response_object.to_xml(:only => active_scaffold_config.show.columns.names), :content_type => Mime::XML, :status => response_status
+      render :xml => response_object.to_xml(:only => show_columns_names), :content_type => Mime::XML, :status => response_status
     end
 
     def show_respond_to_js
@@ -49,13 +50,24 @@ module ActiveScaffold::Actions
     def show_authorized?(record = nil)
       authorized_for?(:crud_type => :read)
     end
+
+    def show_formats
+      (default_formats + active_scaffold_config.formats + active_scaffold_config.show.formats).uniq
+    end
+
+    def show_columns
+      active_scaffold_config.show.columns
+    end
+
+    def show_columns_names
+      show_columns.collect(&:name)
+    end
+    
     private 
     def show_authorized_filter
       link = active_scaffold_config.show.link || active_scaffold_config.show.class.link
       raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
     end
-    def show_formats
-      (default_formats + active_scaffold_config.formats + active_scaffold_config.show.formats).uniq
-    end
+    
   end
 end

data/lib/active_scaffold/actions/update.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Actions
                   :only => :update,
                   :redirect_to => { :action => :index }
       base.helper_method :update_refresh_list?
+      base.helper_method :update_columns
     end
 
     def edit
@@ -57,13 +58,13 @@ module ActiveScaffold::Actions
       render :action => 'on_update'
     end
     def update_respond_to_xml
-      render :xml => response_object.to_xml(:only => active_scaffold_config.update.columns.names), :content_type => Mime::XML, :status => response_status
+      render :xml => response_object.to_xml(:only => update_columns_names), :content_type => Mime::XML, :status => response_status
     end
     def update_respond_to_json
-      render :text => response_object.to_json(:only => active_scaffold_config.update.columns.names), :content_type => Mime::JSON, :status => response_status
+      render :text => response_object.to_json(:only => update_columns_names), :content_type => Mime::JSON, :status => response_status
     end
     def update_respond_to_yaml
-      render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.update.columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+      render :text => Hash.from_xml(response_object.to_xml(:only => update_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
     # A simple method to find and prepare a record for editing
     # May be overridden to customize the record (set default values, etc.)
@@ -82,7 +83,7 @@ module ActiveScaffold::Actions
     def update_save(options = {})
       begin
         active_scaffold_config.model.transaction do
-          @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record]) unless options[:no_record_param_update]
+          @record = update_record_from_params(@record, update_columns, params[:record]) unless options[:no_record_param_update]
           before_update_save(@record)
           self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
           if successful?
@@ -136,16 +137,28 @@ module ActiveScaffold::Actions
     def update_authorized?(record = nil)
       (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :update)
     end
-    private
-    def update_authorized_filter
-      link = active_scaffold_config.update.link || active_scaffold_config.update.class.link
-      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
-    end
+
     def edit_formats
       (default_formats + active_scaffold_config.formats).uniq
     end
+    
     def update_formats
       (default_formats + active_scaffold_config.formats + active_scaffold_config.update.formats).uniq
     end
+
+    def update_columns
+      active_scaffold_config.update.columns
+    end
+
+    def update_columns_names
+      update_columns.collect(&:name)
+    end
+    
+    private
+    def update_authorized_filter
+      link = active_scaffold_config.update.link || active_scaffold_config.update.class.link
+      raise ActiveScaffold::ActionNotAllowed unless self.send(link.security_method)
+    end
+
   end
 end

data/lib/active_scaffold/bridges/tiny_mce/bridge.rb

@@ -1,5 +1,21 @@
 ActiveScaffold::Bridges.bridge "TinyMCE" do
   install do
     require File.join(File.dirname(__FILE__), "lib/tiny_mce_bridge.rb")
+    directory = File.dirname(__FILE__)
+    destination = File.join(Rails.root, "public/javascripts/active_scaffold/default/")
+
+    if ActiveScaffold.js_framework == :jquery
+      source = File.join(directory, "public/javascripts/jquery/tiny_mce_bridge.js")
+      FileUtils.rm(File.join(destination, 'tiny_mce_bridge.js')) if File.exist?(File.join(destination, 'tiny_mce_bridge.js'))
+      FileUtils.cp(source, destination)
+    else
+      source = File.join(directory, "public/javascripts/prototype/tiny_mce_bridge.js")
+      FileUtils.rm(File.join(destination, 'tiny_mce_bridge.js')) if File.exist?(File.join(destination, 'tiny_mce_bridge.js'))
+      FileUtils.cp(source, destination)
+    end unless defined?(ACTIVE_SCAFFOLD_INSTALL_ASSETS) && ACTIVE_SCAFFOLD_INSTALL_ASSETS == false
+  end
+
+  install? do
+    true
   end
 end

data/lib/active_scaffold/bridges/tiny_mce/lib/tiny_mce_bridge.rb

@@ -1,49 +1,15 @@
 module ActiveScaffold
   module TinyMceBridge
     module ViewHelpers
-      def active_scaffold_includes(*args)
-        if ActiveScaffold.js_framework == :jquery
-          tiny_mce_js = javascript_tag(%|
-var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
-ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
-  $(this.adapter).find('textarea.mceEditor').each(function(index, elem) {
-    tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
-  });
-  action_link_close.apply(this);
-};
-          |) if using_tiny_mce?
-        else
-          tiny_mce_js = javascript_tag(%|
-var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
-ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
-  this.adapter.select('textarea.mceEditor').each(function(elem) {
-    tinyMCE.execCommand('mceRemoveControl', false, elem.id);
-  });
-  action_link_close.apply(this);
-};
-          |) if using_tiny_mce?
-        end
-        super(*args) + (include_tiny_mce_if_needed || '') + (tiny_mce_js || '')
-      end
     end
 
     module FormColumnHelpers
       def active_scaffold_input_text_editor(column, options)
-        options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
+        options[:class] = "#{options[:class]} as_mceEditor #{column.options[:class]}".strip
         html = []
         html << send(override_input(:textarea), column, options)
-        html << javascript_tag("tinyMCE.execCommand('mceAddControl', false, '#{options[:id]}');") if request.xhr?
         html.join "\n"
       end
-
-      def onsubmit
-        if ActiveScaffold.js_framework == :jquery
-          submit_js = 'tinyMCE.triggerSave();$(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, $(elem).attr(\'id\')); });' if using_tiny_mce?
-        else
-          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });' if using_tiny_mce?
-        end
-        [super, submit_js].compact.join ';'
-      end
     end
 
     module SearchColumnHelpers

data/lib/active_scaffold/bridges/tiny_mce/public/javascripts/jquery/tiny_mce_bridge.js

@@ -0,0 +1,22 @@
+$('form.as_form').live('as:form_loaded', function(event) {
+    var as_form = $(this).closest("form");
+    as_form.find('textarea.as_mceEditor').each(function(index, elem) {
+      tinyMCE.execCommand('mceAddControl', false, $(elem).attr('id'));
+    });
+    return true;
+  });
+$('form.as_form').live('as:form_submit', function(event) {
+    var as_form = $(this).closest("form");
+    if (as_form.has('textarea.as_mceEditor').length > 0) {
+      tinyMCE.triggerSave();
+    }
+    return true;
+  });
+
+$('form.as_form').live('as:form_unloaded', function(event) {
+    var as_form = $(this).closest("form");
+    as_form.find('textarea.as_mceEditor').each(function(index, elem) {
+      tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
+    });
+    return true;
+  });

data/lib/active_scaffold/bridges/tiny_mce/public/javascripts/prototype/tiny_mce_bridge.js

@@ -0,0 +1,21 @@
+document.on('as:form_loaded', 'form.as_form', function(event) {
+    var as_form = event.findElement('form');
+    as_form.select('textarea.mceEditor').each(function(elem) {
+      tinyMCE.execCommand('mceAddControl', false, elem.id);
+    });
+    return true;
+  });
+document.on('as:form_submit', 'form.as_form', function(event) {
+    var as_form = event.findElement('form');
+    if (as_form.has('textarea.mceEditor').length > 0) {
+      tinyMCE.triggerSave();
+    }
+    return true;
+  });
+document.on('as:form_unloaded', 'form.as_form', function(event) {
+    var as_form = event.findElement('form');
+    as_form.select('textarea.mceEditor').each(function(elem) {
+      tinyMCE.execCommand('mceRemoveControl', false, elem.id);
+    });
+    return true;
+  });

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -27,11 +27,16 @@ module ActiveScaffold::DataStructures
     end
 
     def include?(item)
-      @set.each do |c|
-        return true if !c.is_a? Symbol and c.include? item
-        return true if c == item.to_sym
+      @set.any? do |c|
+        case c
+        when Symbol
+          c == item.to_sym
+        when ActiveScaffold::DataStructures::Column
+          c.name == item.to_sym
+        when ActiveScaffold::DataStructures::ActionColumns
+          !c.is_a? Symbol and c.include? item
+        end
       end
-      return false
     end
 
     def names
@@ -42,6 +47,20 @@ module ActiveScaffold::DataStructures
       Array(@set)
     end
 
+    def select(&block)
+      self.convert_to_columns unless columns_converted?
+      #columns = ActiveScaffold::DataStructures::ActionColumns.new
+      columns = self.clone
+      #ActiveScaffold::DataStructures::ActionColumns.class_eval {include ActiveScaffold::DataStructures::ActionColumns::AfterConfiguration}
+      #columns.label = self.label
+      #columns.action = self.action
+      columns.instance_variable_get('@set').clear
+      cols = @set.select &block
+
+      columns.add cols
+      columns
+    end
+
     protected
 
     def collect_columns
@@ -53,6 +72,22 @@ module ActiveScaffold::DataStructures
       @set = from.instance_variable_get('@set').clone
     end
 
+    # at the beginning items are only symbolized column names to allow easy configuration
+    # later on we need ActiveScaffold::Datastructures:ActionColumn
+    def convert_to_columns
+      @set.collect! do|item|
+        unless item.is_a? ActiveScaffold::DataStructures::ActionColumns
+          item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
+        end
+        item
+      end
+      @columns_converted = true
+    end
+
+    def columns_converted?
+      @columns_converted
+    end
+
     # A package of stuff to add after the configuration block. This is an attempt at making a certain level of functionality inaccessible during configuration, to reduce possible breakage from misuse.
     # The bulk of the package is a means of connecting the referential column set (ActionColumns) with the actual column objects (Columns). This lets us iterate over the set and yield real column objects.
     module AfterConfiguration
@@ -63,34 +98,30 @@ module ActiveScaffold::DataStructures
       #  * :flatten - whether to recursively iterate on nested sets. default is false.
       #  * :for - the record (or class) being iterated over. used for column-level security. default is the class.
       def each(options = {}, &proc)
+        self.convert_to_columns unless columns_converted?
         options[:for] ||= @columns.active_record_class
         self.unauthorized_columns = []
         @set.each do |item|
-          unless item.is_a? ActiveScaffold::DataStructures::ActionColumns
-            item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
-            next if self.skip_column?(item, options)
-          end
-          if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten]
-            item.each(options, &proc)
-          else
-            yield item
+          case item
+          when ActiveScaffold::DataStructures::Column 
+            self.skip_column?(item, options) ? next : (yield item)
+          when ActiveScaffold::DataStructures::ActionColumns
+            options[:flatten] ? item.each(options, &proc) : (yield item)
           end
         end
       end
       
       def collect_visible(options = {}, &proc)
+        self.convert_to_columns unless columns_converted?
         columns = []
         options[:for] ||= @columns.active_record_class
         self.unauthorized_columns = []
         @set.each do |item|
-          unless item.is_a? ActiveScaffold::DataStructures::ActionColumns
-            item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
-            next if self.skip_column?(item, options)
-          end
-          if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten]
-            columns = columns + item.collect(options, &proc)
-          else
-            columns << item
+          case item
+          when ActiveScaffold::DataStructures::Column
+            self.skip_column?(item, options) ? next : (columns << item)
+          when ActiveScaffold::DataStructures::ActionColumns
+            options[:flatten] ? item.collect(options, &proc) : (columns << item)
           end
         end
         columns

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -232,7 +232,8 @@ module ActiveScaffold
       def visibles_and_hiddens(search_config)
         visibles = [] 
         hiddens = []
-        search_config.columns.each do |column|
+        columns = field_search_columns
+        columns.each do |column|
           next unless column.search_sql
           if search_config.optional_columns.include?(column.name) && !searched_by?(column)
             hiddens << column

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 21
+    PATCH = 22
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 3
   - 0
-  - 21
-  version: 3.0.21
+  - 22
+  version: 3.0.22
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 +02:00
+date: 2011-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -267,6 +267,8 @@ files:
 - lib/active_scaffold/bridges/shared/date_bridge.rb
 - lib/active_scaffold/bridges/tiny_mce/bridge.rb
 - lib/active_scaffold/bridges/tiny_mce/lib/tiny_mce_bridge.rb
+- lib/active_scaffold/bridges/tiny_mce/public/javascripts/jquery/tiny_mce_bridge.js
+- lib/active_scaffold/bridges/tiny_mce/public/javascripts/prototype/tiny_mce_bridge.js
 - lib/active_scaffold/bridges/validation_reflection/bridge.rb
 - lib/active_scaffold/bridges/validation_reflection/lib/validation_reflection_bridge.rb
 - lib/active_scaffold/config/base.rb