active_scaffold 3.2.20 → 3.3.0.rc

data/CHANGELOG

@@ -1,16 +1,22 @@
-= 3.2.20
-- Some fixes for ruby 1.9
-- Some fixes for rails 3.1
-- Fix detection of empty for has_and_belongs_to_many on subforms
-
-= 3.2.19
-- Avoid crashing when between is chosen and from or to is not filled
-
-= 3.2.18
-- Fix add existing record with record_select
-- Disable link for polymorphic associations in 3.2.x, it doesn't work
-
-= 3.2.17
+= master
+- Unify field overrides and list_ui method signatures
+- Improve performance removing some partials and adding some caching for helper overrides and UIs, and caching url generation for lists (optional)
+- Drop support for rails 3.1
+- Add HTML5 form fields
+- Add :chosen form_ui, and :chosen and :multi_chosen search_ui
+- Fix nested with has_one associations, and belongs_to associations with :list action
+- Support optgroup in :select and :chosen form_ui
+- Support render_form_field with multiple rows (rows with associated-record class)
+- Support for updating columns, row or table after updating a column with inplace_edit
+- Keep order for records in plural subforms, so new records are saved in same order as form order
+- Support add_subgroup in horizontal subforms
+- Improve support in helpers for using :select form_ui with polymorphic associations (needs to use a select to choose the class)
+- Allow to create in nested has_many :through associations, when source association is a belongs_to
+- Fix calculations using field_search with has_many includes
+- Add support to ActiveScaffold.create_record_row to insert after or before of an element
+- Add support for dynamic action group
+
+= 3.2.17 (not released yet)
 - fix constraints for columns with multiple columns in search_sql
 - remove unauthorized collection links
 - copy parameters and html_options on cloning action link

data/README

@@ -0,0 +1,66 @@
+ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
+
+Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
+http://codinginparadise.org
+
+Uses Querystring by Adam Vandenberg
+http://adamv.com/dev/javascript/querystring
+
+Uses Paginator by Bruce Williams
+http://paginator.rubyforge.org/
+
+Supports RecordSelect by Lance Ivy
+http://code.google.com/p/recordselect/
+
+== Version Information
+
+If you want to use the gem, add to your Gemfile:
+  gem "active_scaffold"
+
+In case you would like to use most recent commit:
+  gem 'active_scaffold', :git => 'git://github.com/activescaffold/active_scaffold.git'
+
+3.1.* and 3.2.* versions works with rails 3.1 and 3.2, 3.0.* versions with rails 3.0.
+To use previous rails versions you will have to install the right branch as a plugin.
+
+Active Scaffold master currently supports rails 3.1 and rails 3.2, you can use following branches for previous rails versions:
+Rails 3.0.*: Active Scaffold rails-3.0
+Rails 2.3.*: Active Scaffold rails-2.3 and v2.4
+Rails 2.2.*: Active Scaffold rails-2.2
+Rails 2.1.*: Active Scaffold rails-2.1
+Rails < 2.1: Active Scaffold 1-1-stable (no guarantees)
+
+Since Rails 2.3, render_component plugin is needed for nested and embedded scaffolds. It works with rails-2.3 branch from ewildgoose repository:
+script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3
+
+Since Rails 3.0 render_component is not used for nesting, but is optional for embedded scaffolds.
+For Rails 3.0, https://github.com/rails/verification.git is also needed, not in rails 3.1 or higher.
+
+If you want to install as plugins under vendor/plugins, install these versions:
+  rails plugin install git://github.com/vhochstein/render_component.git
+  rails plugin install git://github.com/rails/verification.git
+  rails plugin install git://github.com/activescaffold/active_scaffold.git -r 'rails-3.0'
+
+== Pick your own javascript framework
+
+The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
+Out of the box Prototype or JQuery are supported for rails 3.1 and later. For rails 3.0 pick a JS file:
+
+Prototype 1.7 (default js framework)
+rails.js in git://github.com/vhochstein/prototype-ujs.git
+
+JQuery 1.4.1, 1.4.2
+https://github.com/vhochstein/jquery-ujs/raw/jquery1_4_2/src/rails.js
+
+JQuery > 1.4.2
+https://github.com/vhochstein/jquery-ujs/raw/master/src/rails.js
+
+To configure the javascript framework when installed under vendor/plugins/
+uncomment last line in config/initializers/active_scaffold.rb in order to use jquery instead of prototype.
+That file is created when you install ActiveScaffold as a plugin.
+
+To configure the javascript framework when installed as a gem:
+Add a config/initializers/active_scaffold.rb containing:
+ActiveScaffold.js_framework = :jquery # :prototype is the default
+
+Released under the MIT license (included)

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -1,32 +1,40 @@
-jQuery(document).ready(function() {
-  jQuery('form.as_form').live('ajax:beforeSend', function(event) {
+jQuery(document).ready(function($) {
+  jQuery(document).click(function(event) {
+    jQuery('.action_group.dyn ul').remove();
+  });
+  jQuery(document).on('ajax:complete', '.action_group.dyn ul a', function(event) {
+    var action_link = ActiveScaffold.find_action_link(event.target);
+    if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
+    jQuery(event.target).closest('.action_group.dyn ul').remove();
+  });
+  jQuery(document).on('ajax:beforeSend', 'form.as_form', function(event) {
     var as_form = jQuery(this).closest("form");
-    if (as_form.attr('data-loading') == 'true') {
+    if (as_form.data('loading') == true) {
       ActiveScaffold.disable_form(as_form);
     }
     return true;
   });
   
-  jQuery('form.as_form').live('ajax:complete', function(event) {
+  jQuery(document).on('ajax:complete', 'form.as_form', function(event) {
     var as_form = jQuery(this).closest("form");
-    if (as_form.attr('data-loading') == 'true') {
+    if (as_form.data('loading') == true) {
       ActiveScaffold.enable_form(as_form);
     }
   });
-  jQuery('form.as_form').live('ajax:error', function(event, xhr, status, error) {
+  jQuery(document).on('ajax:error', 'form.as_form', function(event, xhr, status, error) {
     var as_div = jQuery(this).closest("div.active-scaffold");
     if (as_div.length) {
       ActiveScaffold.report_500_response(as_div);
     }
   });
-  jQuery('form.as_form.as_remote_upload').live('submit', function(event) {
+  jQuery(document).on('submit', 'form.as_form:not([data-remote])', function(event) {
     var as_form = jQuery(this).closest("form");
-    if (as_form.attr('data-loading') == 'true') {
+    if (as_form.data('loading') == true) {
       setTimeout("ActiveScaffold.disable_form('" + as_form.attr('id') + "')", 10);
     }
     return true;
   });
-  jQuery('a.as_action').live('ajax:before', function(event) {
+  jQuery(document).on('ajax:before', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       if (action_link.is_disabled()) {
@@ -38,7 +46,7 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('a.as_action').live('ajax:success', function(event, response) {
+  jQuery(document).on('ajax:success', 'a.as_action', function(event, response) {
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       if (action_link.position) {
@@ -51,14 +59,14 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('a.as_action').live('ajax:complete', function(event) {
+  jQuery(document).on('ajax:complete', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
     }
     return true;
   });
-  jQuery('a.as_action').live('ajax:error', function(event, xhr, status, error) {
+  jQuery(document).on('ajax:error', 'a.as_action', function(event, xhr, status, error) {
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
@@ -66,7 +74,7 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('a.as_cancel').live('ajax:before', function(event) {
+  jQuery(document).on('ajax:before', 'a.as_cancel', function(event) {
     var as_cancel = jQuery(this);
     var action_link = ActiveScaffold.find_action_link(as_cancel);  
     
@@ -80,7 +88,7 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('a.as_cancel').live('ajax:success', function(event, response) {
+  jQuery(document).on('ajax:success', 'a.as_cancel', function(event, response) {
     var action_link = ActiveScaffold.find_action_link(jQuery(this));
 
     if (action_link) {
@@ -92,28 +100,27 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('a.as_cancel').live('ajax:error', function(event, xhr, status, error) {
+  jQuery(document).on('ajax:error', 'a.as_cancel', function(event, xhr, status, error) {
     var action_link = ActiveScaffold.find_action_link(jQuery(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
     }
     return true;
   });
-  jQuery('a.as_sort').live('ajax:before', function(event) {
+  jQuery(document).on('ajax:before', 'a.as_sort', function(event) {
     var as_sort = jQuery(this);
-    var history_controller_id = as_sort.attr('data-page-history');
+    var history_controller_id = as_sort.data('page-history');
     if (history_controller_id) addActiveScaffoldPageToHistory(as_sort.attr('href'), history_controller_id);
     as_sort.closest('th').addClass('loading');
     return true;
   });
-  jQuery('a.as_sort').live('ajax:error', function(event, xhr, status, error) {
+  jQuery(document).on('ajax:error', 'a.as_sort', function(event, xhr, status, error) {
     var as_scaffold = jQuery(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  jQuery('td.in_place_editor_field').live('hover', function(event) {
+  jQuery(document).on('hover', 'td.in_place_editor_field', function(event) {
     var td = jQuery(this), span = td.find('span.in_place_editor_field');
-    span.data(); // $ 1.4.2 workaround
     if (event.type == 'mouseenter') {
       if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').addClass("hover");
      }
@@ -122,30 +129,30 @@ jQuery(document).ready(function() {
     }
     return true;
   });
-  jQuery('td.in_place_editor_field, th.as_marked-column_heading').live('click', function(event) {
+  jQuery(document).on('click', 'td.in_place_editor_field, th.as_marked-column_heading', function(event) {
     var span = jQuery(this).find('span.in_place_editor_field');
     span.data('addEmptyOnCancel', jQuery(this).hasClass('empty'));
     jQuery(this).removeClass('empty');
     if (span.data('editInPlace')) span.trigger('click.editInPlace');
     else ActiveScaffold.in_place_editor_field_clicked(span);
   });
-  jQuery('a.as_paginate').live('ajax:before',function(event) {
+  jQuery(document).on('ajax:before', 'a.as_paginate',function(event) {
     var as_paginate = jQuery(this);
-    var history_controller_id = as_paginate.attr('data-page-history');
+    var history_controller_id = as_paginate.data('page-history');
     if (history_controller_id) addActiveScaffoldPageToHistory(as_paginate.attr('href'), history_controller_id);
     as_paginate.prevAll('img.loading-indicator').css('visibility','visible');
     return true;
   });
-  jQuery('a.as_paginate').live('ajax:error', function(event, xhr, status, error) {
+  jQuery(document).on('ajax:error', 'a.as_paginate', function(event, xhr, status, error) {
     var as_scaffold = jQuery(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  jQuery('a.as_paginate').live('ajax:complete', function(event) {
+  jQuery(document).on('ajax:complete', 'a.as_paginate', function(event) {
     jQuery(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
-  jQuery('a.as_add_existing, a.as_replace_existing').live('ajax:before', function(event) {
+  jQuery(document).on('ajax:before', 'a.as_add_existing, a.as_replace_existing', function(event) {
     var id = jQuery(this).prev().val();
     if (id) {
       if (!jQuery(this).data('href')) jQuery(this).data('href', jQuery(this).attr('href'));
@@ -153,26 +160,26 @@ jQuery(document).ready(function() {
       return true;
     } else return false;
   });
-  jQuery('input.update_form:not(.recordselect), textarea.update_form, select.update_form').live('change', function(event) {
+  jQuery(document).on('change', 'input.update_form:not(.recordselect), textarea.update_form, select.update_form', function(event) {
     var element = jQuery(this);
     var value = element.is("input:checkbox:not(:checked)") ? null : element.val();
-    ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), value);
+    ActiveScaffold.update_column(element, element.data('update_url'), element.data('update_send_form'), element.attr('id'), value);
     return true;
   });
-  jQuery('input.recordselect.update_form').live('recordselect:change', function(event, id, label) {
+  jQuery(document).on('recordselect:change', 'input.recordselect.update_form', function(event, id, label) {
     var element = jQuery(this);
-    ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), id);
+    ActiveScaffold.update_column(element, element.data('update_url'), element.data('update_send_form'), element.attr('id'), id);
     return true;
   });
   
-  jQuery('select.as_search_range_option').live('change', function(event) {
+  jQuery(document).on('change', 'select.as_search_range_option', function(event) {
     var element = jQuery(this);
     ActiveScaffold[element.val() == 'BETWEEN' ? 'show' : 'hide'](element.closest('dd').find('.as_search_range_between'));
     ActiveScaffold[(element.val() == 'null' || element.val() == 'not_null') ? 'hide' : 'show'](element.attr('id').replace(/_opt/, '_numeric'));
     return true;
   });
   
-  jQuery('select.as_search_date_time_option').live('change', function(event) {
+  jQuery(document).on('change', 'select.as_search_date_time_option', function(event) {
     var element = jQuery(this);
     ActiveScaffold[!(element.val() == 'PAST' || element.val() == 'FUTURE' || element.val() == 'RANGE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_numeric'));
     ActiveScaffold[(element.val() == 'PAST' || element.val() == 'FUTURE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_trend'));
@@ -180,18 +187,18 @@ jQuery(document).ready(function() {
     return true;
   });
 
-  jQuery('select.as_update_date_operator').live('change', function(event) {
+  jQuery(document).on('change', 'select.as_update_date_operator', function(event) {
     ActiveScaffold[jQuery(this).val() == 'REPLACE' ? 'show' : 'hide'](jQuery(this).next());
     ActiveScaffold[jQuery(this).val() == 'REPLACE' ? 'hide' : 'show'](jQuery(this).next().next());
     return true;
   });
 
-  jQuery('a[data-popup]').live('click', function(e) {
+  jQuery(document).on('click', 'a[data-popup]', function(e) {
     window.open(jQuery(this).attr('href'));
     e.preventDefault();
   });
 
-  jQuery('.hover_click').live("click", function(event) {
+  jQuery(document).on("click", '.hover_click', function(event) {
     var element = jQuery(this);
     var ul_element = element.children('ul').first();
     if (ul_element.is(':visible')) {
@@ -201,7 +208,7 @@ jQuery(document).ready(function() {
     }
     return false;
   });
-  jQuery('.hover_click a.as_action').live('click', function(event) {
+  jQuery(document).on('click', '.hover_click a.as_action', function(event) {
     var element = jQuery(this).closest('.hover_click');
     if (element) {
       element.find('ul').hide();
@@ -209,10 +216,11 @@ jQuery(document).ready(function() {
     return true;
   });
 
-  jQuery('.message a.close').live('click', function(e) {
+  jQuery(document).on('click', '.message a.close', function(e) {
     ActiveScaffold.hide(jQuery(this).closest('.message'));
     e.preventDefault();
   });
+  
 });
 
 /* Simple Inheritance
@@ -288,7 +296,7 @@ jQuery(document).ready(function() {
 */
 
 if (typeof(jQuery.fn.delayedObserver) === 'undefined') { 
-  (function() {
+  (function($) {
     var delayedObserverStack = [];
     var observed;
    
@@ -334,7 +342,7 @@ if (typeof(jQuery.fn.delayedObserver) === 'undefined') {
         });
       }
     });
-  })();
+  })(jQuery);
 };
 
 
@@ -434,9 +442,10 @@ var ActiveScaffold = {
     return element;
   },
   
-  remove: function(element) {
+  remove: function(element, callback) {
     if (typeof(element) == 'string') element = '#' + element; 
     jQuery(element).remove();
+    if (callback) callback();
   },
 
   update_inplace_edit: function(element, value, empty) {
@@ -460,22 +469,23 @@ var ActiveScaffold = {
     jQuery(element).get(0).reset();
   },
   
-  disable_form: function(as_form) {
+  disable_form: function(as_form, skip_loading_indicator) {
     if (typeof(as_form) == 'string') as_form = '#' + as_form;
     as_form = jQuery(as_form)
     var loading_indicator = jQuery('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
-    if (loading_indicator) loading_indicator.css('visibility','visible');
+    if (!skip_loading_indicator && loading_indicator) loading_indicator.css('visibility','visible');
     jQuery('input[type=submit]', as_form).attr('disabled', 'disabled');
-    as_form[0].disabled_fields = jQuery("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled');
+    // data-remote-disabled attr instead of set data because is used to in selector later
+    jQuery("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled').attr('data-remove-disabled', true);
   },
   
-  enable_form: function(as_form) {
+  enable_form: function(as_form, skip_loading_indicator) {
     if (typeof(as_form) == 'string') as_form = '#' + as_form;
     as_form = jQuery(as_form)
     var loading_indicator = jQuery('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
-    if (loading_indicator) loading_indicator.css('visibility','hidden');
+    if (!skip_loading_indicator && loading_indicator) loading_indicator.css('visibility','hidden');
     jQuery('input[type=submit]', as_form).removeAttr('disabled');
-    as_form[0].disabled_fields.removeAttr('disabled');
+    jQuery("input[data-remove-disabled],select[data-remove-disabled],textarea[data-remove-disabled]", as_form).removeAttr('disabled data-remove-disabled');
   },  
   
   focus_first_element_of_form: function(form_element) {
@@ -498,11 +508,24 @@ var ActiveScaffold = {
       } else {
         new_row = tbody.append(html).children().last();
       }
+    } else if (typeof options.insert_at == 'object') {
+      var insert_method, get_method, row, id;
+      if (options.insert_at.after) {
+        insert_method = 'after';
+        get_method = 'next';
+      } else {
+        insert_method = 'before';
+        get_method = 'prev';
+      }
+      if (id = options.insert_at[insert_method]) row = tbody.children('#' + id);
+      if (row && row.length) {
+        new_row = row[insert_method](html)[get_method]();
+      }
     }
     this.stripe(tbody);
     this.hide_empty_message(tbody);
     this.increment_record_count(tbody.closest('div.active-scaffold'));
-    ActiveScaffold.highlight(new_row);
+    this.highlight(new_row);
   },
     
   create_record_row_from_url: function(active_scaffold_id, url, options) {
@@ -525,26 +548,17 @@ var ActiveScaffold = {
       }
     }
     
-    row.remove();
-    this.stripe(tbody);
-    this.decrement_record_count(tbody.closest('div.active-scaffold'));
-    this.reload_if_empty(tbody, page_reload_url);
+    ActiveScaffold.remove(row, function() {
+      ActiveScaffold.stripe(tbody);
+      ActiveScaffold.decrement_record_count(tbody.closest('div.active-scaffold'));
+      ActiveScaffold.reload_if_empty(tbody, page_reload_url);
+    });
   },
 
   delete_subform_record: function(record) {
     if (typeof(record) == 'string') record = '#' + record;
-    record = jQuery(record);
-    var errors = record.prev();
-    if (errors.hasClass('association-record-errors')) {
-      this.remove(errors);
-    }
-    var associated = jQuery(record).next();
+    record = jQuery(record).closest('.sub-form-record');
     this.remove(record);
-    while (associated.hasClass('associated-record')) {
-      record = associated;
-      associated = jQuery(record).next();
-      this.remove(record);
-    }
   },
 
   report_500_response: function(active_scaffold_id) {
@@ -562,6 +576,13 @@ var ActiveScaffold = {
     element = jQuery(element);
     return ActiveScaffold.ActionLink.get(element.is('.actions a') ? element : element.closest('.as_adapter'));
   },
+
+  display_dynamic_action_group: function(link, html) {
+    if (typeof(link) == 'string') link = jQuery('#' + link);
+    link.next('ul').remove();
+    link.closest('td').addClass('action_group dyn');
+    link.after(html);
+  },
   
   scroll_to: function(element, checkInViewport) {
     if (typeof checkInViewport == 'undefined') checkInViewport = true;
@@ -578,18 +599,23 @@ var ActiveScaffold = {
   },
   
   process_checkbox_inplace_edit: function(checkbox, options) {
-    var checked = checkbox.is(':checked');
+    var checked = checkbox.is(':checked'), td = checkbox.closest('td');
     if (checked === true) options['params'] += '&value=1';
     jQuery.ajax({
       url: options.url,
       type: "POST",
       data: options['params'],
       dataType: options.ajax_data_type,
-      after: function(request){
+      beforeSend: function(request, settings) {
+        if (options.beforeSend) options.beforeSend.call(checkbox, request, settings);
         checkbox.attr('disabled', 'disabled');
+        td.closest('tr').find('td.actions .loading-indicator').css('visibility','visible');
       },
       complete: function(request){
         checkbox.removeAttr('disabled');
+      },
+      success: function(request){
+        td.closest('tr').find('td.actions .loading-indicator').css('visibility','hidden');
       }
     });
   },
@@ -637,16 +663,18 @@ var ActiveScaffold = {
     content = jQuery(content);
     if (options.singular == false) {
       if (!(options.id && jQuery('#' + options.id).size() > 0)) {
-        var new_element = element.append(content);
-        content.trigger('as:element_updated');
+        var tfoot = element.find('tfoot');
+        if (tfoot.length) tfoot.before(content);
+        else element.append(content);
+        content.trigger('as:element_created');
       }
     } else {
-      var current = jQuery('#' + element.attr('id') + ' .association-record')
+      var current = jQuery('#' + element.attr('id') + ' .sub-form-record')
       if (current[0]) {
         this.replace(current[0], content);
       } else {
         element.prepend(content);
-        content.trigger('as:element_updated');
+        content.trigger('as:element_created');
       }
     }
   },
@@ -654,7 +682,7 @@ var ActiveScaffold = {
   render_form_field: function(source, content, options) {
     if (typeof(source) == 'string') source = '#' + source;
     var source = jQuery(source);
-    var element = source.closest('.association-record');
+    var element = source.closest('.association-record').nextUntil('.association-record').andSelf();
     if (element.length == 0) {
       element = source.closest('form > ol.form');
     }
@@ -669,21 +697,6 @@ var ActiveScaffold = {
     }
   },
   
-  sortable: function(element, controller, options, url_params) {
-    if (typeof(element) == 'string') element = '#' + element;
-    var element = jQuery(element);
-    var sortable_options = jQuery.extend({}, options);
-    if (options.update === true) {
-      url_params.authenticity_token = jQuery('meta[name=csrf-param]').attr('content');
-      sortable_options.update = function(event, ui) {
-         var url = controller + '/' + options.action + '?'
-         url += jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression:/^[^_-](?:[A-Za-z0-9_-]*)-(.*)-row$/});
-         jQuery.post(url.append_params(url_params));
-       }
-    }
-    element.sortable(sortable_options);
-  },
-
   record_select_onselect: function(edit_associated_url, active_scaffold_id, id){
     jQuery.ajax({
       url: edit_associated_url.split('--ID--').join(id),
@@ -721,7 +734,6 @@ var ActiveScaffold = {
   },
 
   in_place_editor_field_clicked: function(span) {
-    span.data(); // $ 1.4.2 workaround
     // test editor is open
     if (typeof(span.data('editInPlace')) === 'undefined') {
       var options = {show_buttons: true,
@@ -729,8 +741,12 @@ var ActiveScaffold = {
                      element_id: 'editor_id',
                      ajax_data_type: "script",
                      delegate: {
-                       willCloseEditInPlace: function(span, options, enteredText) {
+                       willCloseEditInPlace: function(span, options) {
                          if (span.data('addEmptyOnCancel')) span.closest('td').addClass('empty');
+                         span.closest('tr').find('td.actions .loading-indicator').css('visibility','visible');
+                       },
+                       didCloseEditInPlace: function(span, options) {
+                         span.closest('tr').find('td.actions .loading-indicator').css('visibility','hidden');
                        }
                      },
                      update_value: 'value'},
@@ -764,11 +780,11 @@ var ActiveScaffold = {
 
       if (csrf_param) options['params'] = csrf_param.attr('content') + '=' + csrf_token.attr('content');
 
-      if (span.closest('div.active-scaffold').attr('data-eid')) {
+      if (span.closest('div.active-scaffold').data('eid')) {
         if (options['params'].length > 0) {
           options['params'] += "&";
         }
-        options['params'] += ("eid=" + span.closest('div.active-scaffold').attr('data-eid'));
+        options['params'] += ("eid=" + span.closest('div.active-scaffold').data('eid'));
       }
 
       if (mode === 'clone') {
@@ -782,6 +798,26 @@ var ActiveScaffold = {
         if (column_heading.data('ie-plural')) plural = true;
         options.field_type = 'remote';
         options.editor_url = render_url.replace(/__id__/, record_id)
+        if (!options.delegate) options.delegate = {}
+        options.delegate.didOpenEditInPlace = function(dom) { dom.trigger('as:element_updated'); }
+      }
+      var actions, forms;
+      options.beforeSend = function(xhr, settings) {
+        switch (span.data('ie-update')) {
+          case 'update_row':
+            actions = span.closest('tr').find('.actions a:not(.disabled)').addClass('disabled');
+            break;
+          case 'update_table':
+            var table = span.closest('.as_content');
+            actions = table.find('.actions a:not(.disabled)').addClass('disabled');
+            forms = table.find('.as_form');
+            ActiveScaffold.disable_form(forms);
+            break;
+        }
+      }
+      options.error = options.success = function() {
+        if (actions) actions.removeClass('disabled');
+        if (forms) ActiveScaffold.enable_form(forms);
       }
       if (mode === 'inline_checkbox') {
         ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
@@ -797,11 +833,13 @@ var ActiveScaffold = {
     var params = null;
 
     if (send_form) {
-      var selector;
+      var selector, base = as_form;
+      if (send_form == 'row') base = element.closest('.association-record, form');
       if (selector = element.data('update_send_form_selector'))
-        params = as_form.find(selector).serialize();
-      else params = as_form.serialize();
-      params += '&' + jQuery.param({"source_id": source_id});
+        params = base.find(selector).serialize();
+      else if (send_form != as_form) params = base.find(':input').serialize();
+      else base.serialize();
+      params += '&_method=&' + jQuery.param({"source_id": source_id});
     } else {
       params = {value: val};
       params.source_id = source_id;
@@ -810,6 +848,7 @@ var ActiveScaffold = {
     jQuery.ajax({
       url: url,
       data: params,
+      type: 'post',
       beforeSend: function(event) {
         element.nextAll('img.loading-indicator').css('visibility','visible');
         ActiveScaffold.disable_form(as_form);
@@ -828,7 +867,7 @@ var ActiveScaffold = {
   },
   
   draggable_lists: function(element) {
-    jQuery('#' + element).draggable_lists();
+    jQuery('ul#' + element).draggable_lists();
   }
 }
 
@@ -897,15 +936,15 @@ ActiveScaffold.ActionLink = {
       element.data(); // $ 1.4.2 workaround
       if (typeof(element.data('action_link')) === 'undefined' && !element.hasClass('as_adapter')) {
         var parent = element.closest('.actions');
-        if (parent.length === 0) {
+        if (parent.length === 0 || parent.is('td')) {
           // maybe an column action_link
-          parent = element.parent();
+          parent = element.closest('tr.record');
         }
-        if (parent && parent.is('td')) {
+        if (parent.is('tr')) {
           // record action
-          parent = parent.closest('tr.record');
           var target = parent.find('a.as_action');
           var loading_indicator = parent.find('td.actions .loading-indicator');
+          if (!loading_indicator.length) loading_indicator = element.parent().find('.loading-indicator');
           new ActiveScaffold.Actions.Record(target, parent, loading_indicator);
         } else if (parent && parent.is('div')) {
           //table action
@@ -923,12 +962,12 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   init: function(a, target, loading_indicator) {
     this.tag = jQuery(a);
     this.url = this.tag.attr('href');
-    this.method = this.tag.attr('data-method') || 'get';
+    this.method = this.tag.data('method') || 'get';
     this.target = target;
     this.loading_indicator = loading_indicator;
     this.hide_target = false;
-    this.position = this.tag.attr('data-position');
-    this.action = this.tag.attr('data-action');
+    this.position = this.tag.data('position');
+    this.action = this.tag.data('action');
 
     this.tag.data('action_link', this);
     return this;
@@ -943,10 +982,17 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   },
 
   close: function() {
-    this.enable();
-    this.adapter.remove();
-    if (this.hide_target) this.target.show();
-    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+    var link = this;
+    ActiveScaffold.remove(this.adapter, function() {
+      link.enable();
+      if (link.hide_target) link.target.show();
+      if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(link.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+    });
+  },
+
+  reload: function() {
+    this.close();
+    this.open();
   },
 
   get_new_adapter_id: function() {
@@ -985,6 +1031,9 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.adapter.addClass('as_adapter');
     this.adapter.data('action_link', this);
     if (this.refresh_url) jQuery('.as_cancel', this.adapter).attr('href', this.refresh_url);
+  },
+  keep_open: function() {
+    return this.tag.data('keep-open');
   }
 });
 
@@ -994,7 +1043,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
 ActiveScaffold.Actions.Record = ActiveScaffold.Actions.Abstract.extend({
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator);
-    var refresh = this.target.attr('data-refresh');
+    var refresh = this.target.data('refresh');
     if (refresh) l.refresh_url = refresh;
     
     if (l.position) {
@@ -1010,9 +1059,8 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   close_previous_adapter: function() {
     var _this = this;
     jQuery.each(this.set.links, function(index, item) {
-      if (item.url != _this.url && item.is_disabled() && item.adapter) {
-        item.enable();
-        item.adapter.remove();
+      if (item.url != _this.url && item.is_disabled() && !item.keep_open() && item.adapter) {
+        ActiveScaffold.remove(item.adapter, function () { item.enable(); });
       }
     });
   },
@@ -1105,9 +1153,4 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
     }
     ActiveScaffold.highlight(this.adapter.find('td').first().children());
   },
-
-  reload: function() {
-    this.close();
-    this.open();
-  },
 });