active_scaffold 3.2.7 → 3.2.8

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

@@ -1,13 +1,16 @@
-<% scope ||= nil %>
+<%
+  scope ||= nil
+  column_options = active_scaffold_input_options(column, scope)
+%>
 <dl>
   <dt>
-    <label for="<%= active_scaffold_input_options(column, scope)[:id] %>"><%= column.label %></label>
+    <label for="<%= column_options[:id] %>"><%= column.label %></label>
   </dt>
   <dd>
     <% unless local_assigns[:only_value] %>
     <%=raw active_scaffold_input_for column, scope %>
     <% else %>
-    <%= get_column_value(@record, column) %>
+    <%= content_tag :span, get_column_value(@record, column), options.except(:name) %>
     <%= hidden_field :record, column.association ? column.association.foreign_key : column.name, active_scaffold_input_options(column, scope) -%>
     <% end %>
     <% if column.update_columns -%>

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

@@ -1,5 +1,5 @@
-<%= render :partial => 'messages' %>
+<%= render :partial => 'messages' unless request.xhr? %>
 
 <% unless @record.nil? %>
-    <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
-<% end %>
+  <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
+<% end %>

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

@@ -24,7 +24,7 @@
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>
-      <p><%= get_column_value(@record, column) -%></p>
+      <p class="<%= column.name %>-input"><%= get_column_value(@record, column) -%></p>
     <% end -%>
   </td>
 <% end -%>

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

@@ -2,7 +2,7 @@
    columns ||= list_columns -%>
 <tr id="<%= active_scaffold_calculations_id %>" class="active-scaffold-calculations">
   <% columns.each do |column| -%>
-    <td <%= "id=#{active_scaffold_calculations_id(column)}" if column.calculation? %>>
+    <td <%= "id=#{active_scaffold_calculations_id(:column => column)}" if column.calculation? %>>
       <% if column.calculation? -%>
         <%= render_column_calculation(column) %>
       <% else -%>

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

@@ -1,29 +1,26 @@
 <tbody class="messages">
   <tr class="record even-record">
-    <td colspan="<%= columns.length -%>" class="messages-container">
+    <td colspan="<%= columns.length + 1 -%>" class="messages-container">
       <p class="error-message message server-error" style="display:none;">
         <%= as_(:internal_error).html_safe %>
-        <a href="#" onclick="ActiveScaffold.hide(this.parentNode); return false;" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
+        <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>
       </p>
       <div id="<%= active_scaffold_messages_id -%>">
         <%= render :partial => 'messages' %>
       </div>
-      <p class="filtered-message" <%= ' style="display:none;" '.html_safe unless @filtered %>>
+      <div class="filtered-message" <%= ' style="display:none;" '.html_safe unless @filtered %>>
         <%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %>
-      </p>
+        <% if active_scaffold_config.list.show_search_reset && @filtered -%>
+        <div class="reset">
+          <%= loading_indicator_tag(:action => :record, :id => nil) %>
+          <%= render_action_link(active_scaffold_config.list.reset_link, params_for(:search => '')) %>
+        </div>
+        <% end -%>
+      </div>
       <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @page.items.empty? %>>
         <%= as_(active_scaffold_config.list.no_entries_message) %>
       </p>
     </td>
-    <% if active_scaffold_config.list.show_search_reset && @filtered -%>
-      <% search_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :member, :position => false)
-      action_links = ActiveScaffold::DataStructures::ActionLinks.new
-      action_links.add(search_link)  -%>
-      <%= render :partial => 'list_actions', :locals => {:record => new_model, :url_options => params_for(:search => ''), :action_links => action_links.member} %>
-    <% else %>
-      <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @page.items.empty? %></td>
-    <% end -%>
-
   </tr>
 </tbody>    
 

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

@@ -2,7 +2,7 @@
   <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
   <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
 
-  <td class="<%= column_class(column, column_value, record) %>" >
+  <%= content_tag :td, column_attributes(column, record).merge(:class => column_class(column, column_value, record)) do %>
     <%= authorized ? render_list_column(column_value, column, record) : column_value %>
-  </td>
+  <% end %>
 <% end -%>

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

@@ -3,7 +3,7 @@
     <div class="<%= "#{name}-message message" %>">
       <%= h flash[name] %>
       <% if request.xhr? %>
-        <a href="#" onclick="ActiveScaffold.remove(this.parentNode); return false;" title="<%= as_(:close) %>"><%= as_(:close) %></a>
+        <a href="#" class="close" title="<%= as_(:close) %>"><%= as_(:close) %></a>
       <% end %>
     </div>
   <% end %>

data/frontends/default/views/_refresh_list.js.erb

@@ -0,0 +1 @@
+ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');

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

@@ -1,6 +1,6 @@
 <%= render :partial => 'list_record', :locals => {:record => record}%>
 <%= javascript_tag do %>
-ActiveScaffold.replace('<%= active_scaffold_calculations_id %>', '<%= escape_javascript render(:partial => 'list_calculations') %>');
-<% end if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
+  <%= render :partial => 'update_calculations', :formats => [:js] %>
+<% end %>
 
 

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

@@ -17,13 +17,13 @@ options['data-loading'] = true unless live_search
 //<![CDATA[
 <% if ActiveScaffold.js_framework == :prototype %>
   new TextFieldWithExample('<%= search_input_id %>', '<%= as_(live_search ? :live_search : :search_terms) %>', {focus: true});
-<% end -%>
-<% if live_search && ActiveScaffold.js_framework == :prototype -%>
+<% if live_search -%>
   $(<%= search_input_id.to_json.html_safe %>).next().hide();
   new Form.Element.DelayedObserver('<%= search_input_id %>', 0.5, function(element, value) {
     if (!$(element.id)) return false; // because the element may have been destroyed
     $(element).next().click();
   });
+<% end -%>
 <% elsif live_search && ActiveScaffold.js_framework == :jquery %>
   jQuery(<%= "##{search_input_id}".to_json.html_safe %>).next().hide();
   jQuery(<%= "##{search_input_id}".to_json.html_safe %>).delayedObserver(0.5, function() {

data/frontends/default/views/_update_calculations.js.erb

@@ -0,0 +1,4 @@
+<% calculations_id ||= active_scaffold_calculations_id -%>
+<% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
+  ActiveScaffold.replace('<%= calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
+<% end %>

data/frontends/default/views/_update_messages.js.erb

@@ -0,0 +1,2 @@
+<% messages_id ||= active_scaffold_messages_id -%>
+ActiveScaffold.replace_html('<%= messages_id %>', '<%= escape_javascript(render(:partial => 'messages')) %>');

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

@@ -24,7 +24,7 @@
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>
-      <p><%= get_column_value(@record, column) -%></p>
+      <p class="<%= column.name %>-input"><%= get_column_value(@record, column) -%></p>
     <% end -%>
   </li>
 <% end -%>

data/frontends/default/views/add_existing.js.erb

@@ -1,18 +1,14 @@
 <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
 ActiveScaffold.create_record_row('<%= active_scaffold_id %>', '<%= escape_javascript(new_row) %>', <%= {:insert_at => :top}.to_json.html_safe %>);
 
-<% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
-  ActiveScaffold.replace('<%= active_scaffold_calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
-<%end%>
+<%= render :partial => 'update_calculations' %>
 
 <% if form_stays_open ||= true %>
   <%# why not just re-render the form? that wouldn't utilize a possible do_new override which sets default values.%>
   ActiveScaffold.reset_form('<%= element_form_id %>');
   ActiveScaffold.replace_html('<%= element_messages_id(:action => :add_existing) %>', '<%= escape_javascript(render(:partial => 'form_messages')) %>');
   <%# have to delay the focus, because there's no "firstElement" in prototype until at least one element is not disabled%>
-  <% if ActiveScaffold.js_framework == :prototype %>
-      ActiveScaffold.focus_first_element_of_form.defer('<%= element_form_id %>');
-  <% end %>
+  ActiveScaffold.focus_first_element_of_form<%= '.defer' if ActiveScaffold.js_framework == :prototype %>('<%= element_form_id %>');
 <% else %>
   ActiveScaffold.find_action_link('<%= element_form_id(:action => :new_existing) %>').close();
 <% end %>

data/frontends/default/views/destroy.js.erb

@@ -1,24 +1,26 @@
-<%messages_id = active_scaffold_messages_id%>
-<%if controller.send(:successful?)%>
-  <%if render_parent? && controller.respond_to?(:render_component_into_view)%>
-    <%render_parent_options%>
-    <%if render_parent_action == :row%>
-      <%# TODO: That s not working with delete....%>
-      ActiveScaffold.delete_record_row('<%=element_row_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}", :action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max))%>');
-      <%messages_id = active_scaffold_messages_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}")%>
-    <%elsif render_parent_action == :index%>
-      <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options))%>
-    <%end%>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-  <%elsif (active_scaffold_config.delete.refresh_list)%>
-    ActiveScaffold.replace('<%=active_scaffold_content_id%>', '<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
-  <%else%>
-    ActiveScaffold.delete_record_row('<%=element_row_id(:action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max))%>');
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+<% messages_id = active_scaffold_messages_id %>
+<% if controller.send(:successful?) %>
+  <% if render_parent? %>
+    <% if render_parent_action == :row %>
+      <%# TODO: That s not working with delete.... %>
+      <% current_id = controller_id(params[:eid] || params[:parent_sti]) -%>
+      ActiveScaffold.delete_record_row('<%= element_row_id(:controller_id => current_id, :action => 'list', :id => params[:id]) %>', '<%= url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
+      <% messages_id = active_scaffold_messages_id(:controller_id => current_id) %>
+      <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => current_id)} %>
+    <% elsif render_parent_action == :index %>
+      <% if controller.respond_to?(:render_component_into_view) %>
+        <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options)) %>
+      <% else %>
+        ActiveScaffold.reload('<%= url_for render_parent_options %>');
+      <% end %>
     <% end %>
-  <%end%>
-<%else%>
-  <%flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)%>
-<%end%>
-ActiveScaffold.replace_html('<%=messages_id%>', '<%=escape_javascript(render(:partial => 'messages'))%>');
+  <% elsif (active_scaffold_config.delete.refresh_list) %>
+    <%= render :partial => 'refresh_list' %>
+  <% else %>
+    ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
+    <%= render :partial => 'update_calculations' %>
+  <% end %>
+<% else %>
+  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) %>
+<% end %>
+<%= render :partial => 'update_messages', :locals => {:messages_id => messages_id} %>

data/frontends/default/views/on_action_update.js.erb

@@ -1,13 +1,22 @@
-<%if controller.send :successful?%>
-  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%=escape_javascript(render(:partial => 'messages'))%>');
-  <%if @record%>
-  ActiveScaffold.update_row('<%=element_row_id(:action => :list, :id => @record.id)%>','<%=escape_javascript(render(:partial => 'list_record', :locals => {:record => @record}))%>');
-  <%end%>
-  <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+<% if controller.send :successful? %>
+  <% if @record %>
+    <%= render :partial => 'update_messages' %>
+    <% row = escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) -%>
+    <% if @action_link.nil? || @action_link.position %>
+      ActiveScaffold.find_action_link('<%= element_row_id(:action => :list, :id => @record.id) %>').close('<%= row %>');
+    <% else %>
+      ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.id) %>', '<%= row %>');
+      ActiveScaffold.scroll_to('<%= element_row_id(:action => :list, :id => @record.id) %>', true);
     <% end %>
-<%else%>
-  <%flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)%>
-  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%=escape_javascript(render(:partial => 'messages'))%>');
-  ActiveScaffold.scroll_to('<%=active_scaffold_messages_id%>');
-<%end%>
+    <%= render :partial => 'update_calculations' %>
+  <% else %>
+    <% if @action_link.nil? || @action_link.position %>
+      ActiveScaffold.find_action_link('<%= element_row_id(:action => action_name) %>').close();
+    <% end %>
+    <%= render :partial => 'refresh_list' %>
+  <% end %>
+<% else %>
+  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) %>
+  ActiveScaffold.replace_html('<%= active_scaffold_messages_id %>','<%= escape_javascript(render(:partial => 'messages')) %>');
+  ActiveScaffold.scroll_to('<%= active_scaffold_messages_id %>', true);
+<% end %>

data/frontends/default/views/on_create.js.erb

@@ -4,29 +4,32 @@ insert_at ||= :top %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
 action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
-  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-    <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered)%>');
+  <% if render_parent? %>
+    <% if controller.respond_to?(:render_component_into_view) %>
+      <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+      <% if nested_singular_association? %>
+        action_link.close('<%= escape_javascript(parent_rendered)%>');
+      <% else %>
+        <% if render_parent_action == :row %>
+          ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(parent_rendered) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+        <% elsif render_parent_action == :index %>
+          <%= escape_javascript(parent_rendered) %>
+        <% end %>
+        action_link.close();
+      <% end %>
+      <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => render_parent_controller)} unless render_parent_action == :index %>
     <% else %>
-      <% if render_parent_action == :row %>
-        ActiveScaffold.create_record_row(action_link.scaffold(),'<%=  escape_javascript(parent_rendered)%>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
-      <% elsif render_parent_action == :index %>
-        <%= escape_javascript(parent_rendered) %>
+      <% if nested_singular_association? || render_parent_action == :row %>
+        action_link.close();
       <% end %>
-      action_link.close();
-    <% end %>
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+      ActiveScaffold.reload('<%= url_for render_parent_options %>');
     <% end %>
   <% elsif (active_scaffold_config.create.refresh_list) %>
-    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');
+    <%= render :partial => 'refresh_list' %>
   <% elsif params[:parent_controller].nil? %>
     <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
-    ActiveScaffold.create_record_row(action_link.scaffold(),'<%=escape_javascript(new_row)%>', <%={:insert_at => insert_at}.to_json.html_safe%>);
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
-    <% end %>
+    ActiveScaffold.create_record_row(action_link.scaffold(),'<%= escape_javascript(new_row) %>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+    <%= render :partial => 'update_calculations' %>
   <% end %>
 
   <% unless render_parent? %>
@@ -36,12 +39,12 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
       action_link.close();
     <% end %>
     <% if (active_scaffold_config.create.action_after_create) %>
-      var link = $('<%=action_link_id active_scaffold_config.create.action_after_create, @record.id%>');
-      if (link) (function() { link.action_link.open() }).defer();
+      var link = ActiveScaffold.find_action_link('<%= action_link_id active_scaffold_config.create.action_after_create, @record.id %>');
+      if (link) (function() { link.open() })<%= '.defer' if ActiveScaffold.js_framework == :prototype %>();
     <% end %>
   <% end %>
 <% else %>
-  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true}))%>');
-  ActiveScaffold.scroll_to('<%=form_selector%>');
+  ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true})) %>');
+  ActiveScaffold.scroll_to('<%= form_selector %>', true);
 <% end %>
 } catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/on_update.js.erb

@@ -1,33 +1,34 @@
 try {
 <% form_selector = "#{element_form_id(:action => :update)}" %>
-var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
+var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
+action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% if controller.send :successful? %>
   <% if !active_scaffold_config.update.persistent %>
-    <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-      <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-      <% if nested_singular_association? %>
-        action_link.close('<%= escape_javascript(parent_rendered)%>');
-      <% else %>
-        <% if render_parent_action == :row %>
-          action_link.close('<%= escape_javascript(parent_rendered)%>');
+    <% if render_parent? %>
+      <% if controller.respond_to?(:render_component_into_view) %>
+        <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+        <% if nested_singular_association? || render_parent_action == :row %>
+          action_link.close('<%= escape_javascript(parent_rendered) %>');
+          <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => render_parent_controller)} %>
         <% elsif render_parent_action == :index %>
           <%= escape_javascript(parent_rendered) %>
         <% end %>
+      <% else %>
+        <% if nested_singular_association? || render_parent_action == :row %>
+          action_link.close();
+	<% end %>
+	ActiveScaffold.reload('<%= url_for render_parent_options %>');
       <% end %>
-      <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
     <% elsif update_refresh_list? %>
-      ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
+      <%= render :partial => 'refresh_list' %>
     <% else %>
-      <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
-      action_link.close('<%= escape_javascript(updated_row)%>');
-      <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-        ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
-      <% end %>
+      <% updated_row = render :partial => 'list_record', :locals => {:record => @record} %>
+      action_link.close('<%= escape_javascript(updated_row) %>');
+      <%= render :partial => 'update_calculations' %>
     <% end %>
   <% end %>
 <% else %>
-  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true}))%>');
-  ActiveScaffold.scroll_to('<%=form_selector%>');
+  ActiveScaffold.replace('<%= form_selector %>', '<%= escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true})) %>');
+  ActiveScaffold.scroll_to('<%= form_selector %>', true);
 <% end %>
 } catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/refresh_list.js.erb

@@ -1 +1,2 @@
-ActiveScaffold.replace_html('<%=active_scaffold_content_id%>','<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
+<% ActiveSupport::Deprecation.warn "You should use render :partial => 'refresh_list' instead of render :action => 'refresh_list'" %>
+<%= render :partial => 'refresh_list' %>

data/frontends/default/views/row.js.erb

@@ -0,0 +1 @@
+ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render(:partial => 'row', :locals => {:record => @record}) %>');

data/frontends/default/views/update_column.js.erb

@@ -1,16 +1,15 @@
 <% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column]) %>
-<% unless controller.send :successful?%>
-  alert('<%= escape_javascript(@record.errors.full_messages.join("\n"))%>');
-  <% @record.reload%>
-<% end%>
-<% column = active_scaffold_config.columns[params[:column]]%>
-<% if column.inplace_edit%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(get_column_value(@record, column))%>');
-<% else%>
-  <% formatted_value = get_column_value(@record, column)%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');
-<% end%>
-<% if column.calculation?%>
- ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');
-<% end%>
-
+<% unless controller.send :successful? %>
+  alert('<%= escape_javascript(@record.errors.full_messages.join("\n")) %>');
+  <% @record.reload %>
+<% end %>
+<% column = active_scaffold_config.columns[params[:column]] %>
+<% formatted_value = get_column_value(@record, column) %>
+<% if column.inplace_edit %>
+  ActiveScaffold.update_inplace_edit('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>', <%= column_empty?(formatted_value).to_json %>);
+<% else %>
+  ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>');
+<% end %>
+<% if column.calculation? %>
+ ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => column) %>', '<%= escape_javascript(render_column_calculation(column)) %>');
+<% end %>

data/lib/active_scaffold.rb

@@ -138,7 +138,7 @@ module ActiveScaffold
   end
 
   def self.js_config
-    @@js_config ||= {:scroll_on_close => true}
+    @@js_config ||= {:scroll_on_close => :checkInViewport}
   end
 
   # exclude bridges you do not need

data/lib/active_scaffold/actions/core.rb

@@ -27,7 +27,7 @@ module ActiveScaffold::Actions
     end
 
     def render_field_for_inplace_editing
-      register_constraints_with_action_columns(nested.constrained_fields, active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
+      register_constraints_with_action_columns(active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
       @record = find_if_allowed(params[:id], :update)
       render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
     end
@@ -178,7 +178,11 @@ module ActiveScaffold::Actions
     def respond_to_action(action)
       respond_to do |type|
         action_formats.each do |format|
-          type.send(format){ send("#{action}_respond_to_#{format}") }
+          type.send(format) do
+            if respond_to?(method_name = "#{action}_respond_to_#{format}")
+              send(method_name)
+            end
+          end
         end
       end
     end