active_scaffold_vho 3.0.27 → 3.0.28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.0.27)
+    active_scaffold_vho (3.0.28)
       kaminari
       rails (~> 3.0.0)
 
@@ -9,38 +9,38 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
       mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      rack (~> 1.2.5)
+      rack (~> 1.2.1)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
     arel (2.0.10)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    json (1.7.5)
+    json (1.7.6)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -51,26 +51,26 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.19)
     polyglot (0.3.3)
-    rack (1.2.5)
+    rack (1.2.7)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rcov (0.9.9)
     rdoc (3.12)
       json (~> 1.4)
@@ -79,15 +79,13 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_scaffold_vho!
-  bundler (~> 1.0.0)
-  kaminari
-  rails (~> 3.0.0)
+  bundler (>= 1.0.0)
   rcov
   shoulda

data/active_scaffold_vho.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.add_development_dependency(%q<shoulda>, [">= 0"])
-  s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+  s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
   s.add_development_dependency(%q<rcov>, [">= 0"])
 
   s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])

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

@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  $('form.as_form').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     $(this).find('.association-record-new').each(function(index) {
         var record_action = 'empty';
@@ -12,7 +12,7 @@ $(document).ready(function() {
     return true;
   });
   
-  $('form.as_form').live('ajax:loading', function(event) {
+  $(document).on('ajax:beforeSend', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
       ActiveScaffold.disable_form(as_form);
@@ -20,26 +20,26 @@ $(document).ready(function() {
     return true;
   });
   
-  $('form.as_form').live('ajax:complete', function(event) {
+  $(document).on('ajax:complete', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
       ActiveScaffold.enable_form(as_form);
     }
   });
-  $('form.as_form').live('ajax:failure', function(event) {
+  $(document).on('ajax:failure', 'form.as_form', function(event) {
     var as_div = $(this).closest("div.active-scaffold");
     if (as_div) {
       ActiveScaffold.report_500_response(as_div)
     }
   });
-  $('form.as_form.as_remote_upload').live('submit', function(event) {
+  $(document).on('submit', 'form.as_form.as_remote_upload', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
       setTimeout("ActiveScaffold.disable_form('" + as_form.attr('id') + "')", 10);
     }
     return true;
   });
-  $('a.as_action').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       if (action_link.is_disabled()) {
@@ -62,7 +62,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_action').live('ajax:beforeSend', function(event, xhr, settings) {
+  $(document).on('ajax:beforeSend', 'a.as_action', function(event, xhr, settings) {
     xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link && action_link.position) {
@@ -71,7 +71,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_action').live('ajax:success', function(event, response) {
+  $(document).on('ajax:success', 'a.as_action', function(event, response) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       if (action_link.position) {
@@ -84,14 +84,14 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_action').live('ajax:complete', function(event) {
+  $(document).on('ajax:complete', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
     }
     return true;
   });
-  $('a.as_action').live('ajax:failure', function(event) {
+  $(document).on('ajax:failure', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
@@ -99,7 +99,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_cancel', function(event) {
     var as_cancel = $(this);
     var action_link = ActiveScaffold.find_action_link(as_cancel);  
     
@@ -117,7 +117,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:beforeSend', function(event, xhr, settings) {
+  $(document).on('ajax:beforeSend', 'a.as_cancel', function(event, xhr, settings) {
     var as_cancel = $(this);
     var action_link = ActiveScaffold.find_action_link(as_cancel);
     var refresh_data = as_cancel.attr('data-refresh');
@@ -128,7 +128,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:success', function(event, response) {
+  $(document).on('ajax:success', 'a.as_cancel', function(event, response) {
     var action_link = ActiveScaffold.find_action_link($(this));
 
     if (action_link) {
@@ -140,26 +140,26 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:failure', function(event) {
+  $(document).on('ajax:failure', 'a.as_cancel', function(event) {
     var action_link = ActiveScaffold.find_action_link($(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
     }
     return true;
   });
-  $('a.as_sort').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_sort', function(event) {
     var as_sort = $(this);
     var history_controller_id = as_sort.attr('data-page-history');
     if (history_controller_id) addActiveScaffoldPageToHistory(as_sort.attr('href'), history_controller_id);
     as_sort.closest('th').addClass('loading');
     return true;
   });
-  $('a.as_sort').live('ajax:failure', function(event) {
+  $(document).on('ajax:failure', 'a.as_sort', function(event) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('div.active-scaffold-footer .pagination a').live('ajax:before',function(event) {
+  $(document).on('ajax:before','div.active-scaffold-footer .pagination a', function(event) {
     var as_paginate = $(this);
     var loading_indicator = as_paginate.closest('.pagination').find('img.loading-indicator').first();
     var history_controller_id = as_paginate.attr('data-page-history');
@@ -174,16 +174,16 @@ $(document).ready(function() {
     loading_indicator.css('visibility','visible');
     return true;
   });
-  $('div.active-scaffold-footer .pagination a').live('ajax:failure', function(event) {
+  $(document).on('ajax:failure', 'div.active-scaffold-footer .pagination a', function(event) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('div.active-scaffold-footer .pagination a').live('ajax:complete', function(event) {
+  $(document).on('ajax:complete', 'div.active-scaffold-footer .pagination a', function(event) {
     $(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
-  $('a.as_add_existing').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_add_existing', function(event) {
     var selected_id = $(this).prev().val();
     if (selected_id) {
       var url = $(this).attr('href').replace('--ID--', $(this).prev().val());
@@ -195,14 +195,14 @@ $(document).ready(function() {
     }
     
   });
-  $('a.as_destroy_existing').live('click', function(event) {
+  $(document).on('click', 'a.as_destroy_existing', function(event) {
     var associated_record = $(this).closest('tr.association-record');
     ActiveScaffold.delete_subform_record(associated_record);
     event.stopPropagation();
     return false;
   });
 
-  $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
+  $(document).on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
       var element = $(this);
       var as_form = element.closest('form.as_form');
       var params = null;
@@ -240,12 +240,12 @@ $(document).ready(function() {
     return true;
   });
   
-  $('select.as_search_range_option').live('change', function(event) {
+  $(document).on('change', 'select.as_search_range_option', function(event) {
     ActiveScaffold[$(this).val() == 'BETWEEN' ? 'show' : 'hide']($(this).parent().find('.as_search_range_between'));
     return true;
   });
   
-  $('select.as_search_range_option').live('change', function(event) {
+  $(document).on('change', 'select.as_search_range_option', function(event) {
     var element = $(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'));
@@ -253,18 +253,18 @@ $(document).ready(function() {
     return true;
   });
 
-  $('select.as_update_date_operator').live('change', function(event) {
+  $(document).on('change', 'select.as_update_date_operator', function(event) {
     ActiveScaffold[$(this).val() == 'REPLACE' ? 'show' : 'hide']($(this).next());
     ActiveScaffold[$(this).val() == 'REPLACE' ? 'hide' : 'show']($(this).next().next());
     return true;
   });
 
-  $('a[data-popup]').live('click', function(e) {
+  $(document).on('click', 'a[data-popup]', function(e) {
     window.open($(this).attr('href'));
     e.preventDefault();
   });
 
-  $('.hover_click').live("click", function(event) {
+  $(document).on("click", '.hover_click', function(event) {
     var element = $(this);
     var ul_element = element.children('ul').first();
     if (ul_element.is(':visible')) {
@@ -274,19 +274,19 @@ $(document).ready(function() {
     }
     return false;
   });
-  $('.hover_click a.as_action').live('click', function(event) {
+  $(document).on('click', '.hover_click a.as_action', function(event) {
     var element = $(this).closest('.hover_click');
     if (element) {
       element.find('ul').hide();
     }
     return true;
   });
-  $('form.as_form').live('as:form_loaded', function(event) {
+  $(document).on('as:form_loaded', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     ActiveScaffold.focus_first_element_of_form(as_form);
     return true;
   });
-  $('li.horizontal-sub-form').live('as:form_element_loaded', function(event) {
+  $(document).on('as:form_element_loaded', 'li.horizontal-sub-form', function(event) {
     $(this).find('a.as_associated_form_link').each(function(index) {
         ActiveScaffold.show($(this));
         //Show select Box for add_existing as well
@@ -296,7 +296,7 @@ $(document).ready(function() {
     })
     return true;
   });
-  $('li.sub-form').live('as:form_element_loaded', function(event) {
+  $(document).on('as:form_element_loaded', 'li.sub-form', function(event) {
     $(this).find('.association-record-new').each(function(index) {
         $(this).find('input, textarea, select').each(function(index) {
           $(this).data('value_was', $(this).val());
@@ -304,17 +304,17 @@ $(document).ready(function() {
     })
     return true;
   });
-  $('span.mark_heading, span.in_place_editor_field[data-ie_mode="inline_checkbox"]').live('click', function(event) {
+  $(document).on('click', 'span.mark_heading, span.in_place_editor_field[data-ie_mode="inline_checkbox"]', function(event) {
     ActiveScaffold.process_checkbox_inplace_edit($(this).find('input:checkbox'), ActiveScaffold.inplace_edit_options($(this)));
     return true;
   });
-  $('tr.record').live('as:list_row_loaded', function(event) {
+  $(document).on('as:list_row_loaded', 'tr.record', function(event) {
     $(this).closest("tr").find('td > span.in_place_editor_field[data-ie_mode!="inline_checkbox"]').each(function(index) {
       ActiveScaffold.create_inplace_editor($(this));
     });
     return true;
   });
-  $('tr.inline-adapter-autoopen').live('as:list_row_loaded', function(event) {
+  $(document).on('as:list_row_loaded', 'tr.inline-adapter-autoopen', function(event) {
     var actionlink_controllers = $(event.target).attr('data-actionlink-controllers');
     if(actionlink_controllers) {
       actionlink_controllers = actionlink_controllers.split('::');
@@ -332,12 +332,12 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('form.as_form').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'form.as_form', 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) {
+  $(document).on('submit', 'form.as_form[data-remote!="true"]', function(event) {
     var as_form = $(this).closest("form");
     $(this).trigger('as:form_submit');
     return true;
@@ -551,11 +551,12 @@ var ActiveScaffold = {
     if (typeof(element) == 'string') element = '#' + element; 
     element = $(element);
     var new_element = null;
+    var new_fragment = $(html);
     if((typeof(disable_event_trigger) == 'boolean') && disable_event_trigger == true) {
-      new_element = $(html).replaceAll(element);
+      new_element = new_fragment.replaceAll(element).first();
     } else {
       ActiveScaffold.trigger_unload_events(element.find('[data-as_load]').andSelf());
-      new_element = $(html).replaceAll(element);
+      new_element = new_fragment.replaceAll(element).first();
       ActiveScaffold.trigger_load_events(new_element.find('[data-as_load]').andSelf());
     }
     return new_element;
@@ -595,8 +596,8 @@ var ActiveScaffold = {
     as_form = $(as_form)
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','visible');
-    $('input[type=submit]', as_form).attr('disabled', 'disabled');
-    $("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled');
+    $('input[type=submit]', as_form).prop('disabled', true);
+    $("input:enabled,select:enabled,textarea:enabled", as_form).prop('disabled', true);
   },
   
   enable_form: function(as_form) {
@@ -604,13 +605,16 @@ var ActiveScaffold = {
     as_form = $(as_form)
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','hidden');
-    $('input[type=submit]', as_form).attr('disabled', '');
-    $("input:disabled,select:disabled,textarea:disabled", as_form).attr('disabled', '');
+    $('input[type=submit]', as_form).prop('disabled', false);
+    $("input:disabled,select:disabled,textarea:disabled", as_form).prop('disabled', false);
   },  
   
   focus_first_element_of_form: function(form_element) {
-    if (typeof(form_element) == 'string') form_element = '#' + form_element;
-    $(form_element + ":first *:input[type!=hidden]:first").focus();
+    if (typeof(form_element) == 'string') {
+      form_element = '#' + form_element;
+      form_element = $(form_element);
+    }
+    form_element.find("input[type!=hidden]:first").focus();
   },
     
   create_record_row: function(active_scaffold_id, html, options) {
@@ -697,10 +701,10 @@ var ActiveScaffold = {
       data: options['params'],
       dataType: options.ajax_data_type,
       after: function(request){
-        checkbox.attr('disabled', 'disabled');
+        checkbox.prop('disabled', true);
       },
       complete: function(request){
-        checkbox.attr('disabled', '');
+        checkbox.prop('disabled', false);
       }
     });
   },
@@ -722,7 +726,7 @@ var ActiveScaffold = {
   highlight: function(element) {
     if (typeof(element) == 'string') element = $('#' + element);
     if (typeof(element.effect) == 'function') {
-      element.effect("highlight", {}, 3000);
+      element.effect("highlight", {}, 1000);
     }
   },
   
@@ -1171,12 +1175,12 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 
     if (this.position == 'after') {
       this.target.after(this.wrap_with_adapter_html(content, should_refresh_data));
-      ActiveScaffold.trigger_load_events(this.target.next().find('[data-as_load]'));
+      ActiveScaffold.trigger_load_events(this.target.next().find('.records').first().find('> [data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
       this.target.before(this.wrap_with_adapter_html(content, should_refresh_data));
-      ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
+      ActiveScaffold.trigger_load_events(this.target.prev().find('.records').first().find('> [data-as_load]'));
       this.set_adapter(this.target.prev());
     }
     else {
@@ -1211,14 +1215,17 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   
   set_opened: function() {
     var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
+    var new_adapter = null;
     if (this.position == 'after') {
-      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().children(':first-child').html(), should_refresh_data), true);
-      this.set_adapter(new_adapter);
+      new_adapter = this.target.next();
+    } else if (this.position == 'before') {
+      new_adapter = this.target.prev();
     }
-    else if (this.position == 'before') {
-      var new_adapter = ActiveScaffold.replace(this.target.prev(), this.wrap_with_adapter_html(this.target.prev().children(':first-child').html(), should_refresh_data), true);
-      this.set_adapter(new_adapter);
+    if (!new_adapter.hasClass('as_adapter')) {
+      new_adapter = ActiveScaffold.replace(new_adapter, this.wrap_with_adapter_html(new_adapter.children(':first-child').html(), should_refresh_data), true);
+      ActiveScaffold.trigger_load_events(new_adapter.find('.records').first().find('> [data-as_load]'));
     }
+    this.set_adapter(new_adapter);
     this.disable();
   }
 });

data/frontends/default/stylesheets/stylesheet.css

@@ -561,9 +561,9 @@ padding-left: 5px;
 border-left: solid 1px #ccc;
 }
 
-.active-scaffold-footer .previous {
-margin-right: 0;
-padding-right: 5px;
+.active-scaffold-footer .prev {
+margin-right: 3px;
+padding-right: 3px;
 border-right: solid 1px #ccc;
 }
 
@@ -993,7 +993,6 @@ font-size: 100%;
 }
 
 .active-scaffold-found {
-  float:left;
 }
 
 .as_touch a.inline-adapter-close {
@@ -1002,7 +1001,7 @@ height: 27px;
 background: url(../../../images/active_scaffold/default/close_touch.png) 0 0 no-repeat;
 }
 
-.as_touch .as_paginate {
+.as_touch .active-scaffold-pagination a {
 font-size: 20px;
 padding: 3px 10px;
 }

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

@@ -1,7 +1,6 @@
 <% columns.each do |column| %>
   <% authorized = record.authorized_for_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) %>" >
     <%= authorized ? render_list_column(column_value, column, record) : column_value %>
   </td>

data/lib/active_scaffold/actions/list.rb

@@ -33,8 +33,7 @@ module ActiveScaffold::Actions
       end
     end
     def list_respond_to_js
-      if params[:embedded]
-        params.delete(:embedded)
+      if params.delete(:embedded)
         render(:partial => 'list_with_header')
       else
         render :action => 'list.js'
@@ -65,7 +64,7 @@ module ActiveScaffold::Actions
 
       options = { :sorting => active_scaffold_config.list.user.sorting,
         :count_includes => active_scaffold_config.list.user.count_includes }
-      paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format])
+      paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format].to_s)
       if paginate
         options.merge!({
             :per_page => active_scaffold_config.list.user.per_page,

data/lib/active_scaffold/actions/nested.rb

@@ -83,7 +83,7 @@ module ActiveScaffold::Actions
     
     def beginning_of_chain
       if nested? && nested.association && nested.association.collection?
-        nested.parent_scope.send(nested.association.name)
+        nested.parent_scope.send(nested.association.name).where("")
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else

data/lib/active_scaffold/bridges/date_picker/public/javascripts/date_picker_bridge.js

@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  $('form.as_form, form.inplace_form').live('as:form_loaded', function(event) {
+  $(document).on('as:form_loaded', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('input.datetime_picker').each(function(index) {
       var date_picker = $(this);
@@ -16,7 +16,7 @@ $(document).ready(function() {
     });
     return true;
   });
-  $('form.as_form, form.inplace_form').live('as:form_unloaded', function(event) {
+  $(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('input.datetime_picker').each(function(index) {
       var date_picker = $(this);

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

@@ -1,19 +1,18 @@
-$('form.as_form, form.inplace_form').live('as:form_loaded', function(event) {
+$(document).on('as:form_loaded', 'form.as_form, form.inplace_form', 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, form.inplace_form').live('as:form_submit', function(event) {
+$(document).on('as:form_submit', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     if (as_form.has('textarea.as_mceEditor').length > 0) {
       tinyMCE.triggerSave();
     }
     return true;
   });
-
-$('form.as_form, form.inplace_form').live('as:form_unloaded', function(event) {
+$(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', 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'));

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -3,11 +3,11 @@ module ActiveScaffold
     module AssociationHelpers
       # Provides a way to honor the :conditions on an association while searching the association's klass
       def association_options_find(association, conditions = nil)
-        association.klass.where(conditions).where(association.options[:conditions]).all
+        association.klass.where(conditions).where(association.options[:conditions])
       end
 
       def association_options_count(association, conditions = nil)
-        association.klass.where(conditions).where(association.options[:conditions]).count
+        association_options_find(association, conditions).count
       end
 
       # returns options for the given association as a collection of [id, label] pairs intended for the +options_for_select+ helper.

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 27
+    PATCH = 28
 
     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: 49
-  prerelease: false
+  hash: 63
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 27
-  version: 3.0.27
+  - 28
+  version: 3.0.28
 platform: ruby
 authors: 
 - Many, see README
@@ -15,14 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-03 00:00:00 +01:00
-default_executable: 
+date: 2013-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  name: shoulda
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,15 +27,15 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: bundler
+  name: shoulda
+  version_requirements: *id001
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -47,12 +43,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rcov
+  name: bundler
+  version_requirements: *id002
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: rails
+  type: :development
+  name: rcov
+  version_requirements: *id003
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +73,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: kaminari
+  name: rails
+  version_requirements: *id004
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,7 +87,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  type: :runtime
+  name: kaminari
+  version_requirements: *id005
+  prerelease: false
 description: 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.
 email: activescaffold@googlegroups.com
 executables: []
@@ -153,7 +152,6 @@ files:
 - frontends/default/views/_list_header.html.erb
 - frontends/default/views/_list_messages.html.erb
 - frontends/default/views/_list_pagination.html.erb
-- frontends/default/views/_list_pagination_links.html.erb
 - frontends/default/views/_list_record.html.erb
 - frontends/default/views/_list_record_columns.html.erb
 - frontends/default/views/_list_with_header.html.erb
@@ -387,7 +385,6 @@ files:
 - test/run_all.rb
 - test/test_helper.rb
 - uninstall.rb
-has_rdoc: true
 homepage: http://github.com/vhochstein/active_scaffold
 licenses: 
 - MIT
@@ -417,7 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Rails 3 Version of activescaffold supporting prototype and jquery

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

@@ -1,9 +0,0 @@
-<% unless current_page.nil? -%>
-  <% url_options = params_for(:action => :index) -%>
-  <% options = {'data-page-history' => controller_id, :remote => true, :method => :get} -%>
-
-  <%= loading_indicator_tag :action => :pagination %>
-  <%= link_to as_(:previous), url_options.merge(:page => current_page.number - 1), options.merge(:class => "as_paginate previous") if current_page.prev? %>
-  <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_window %>
-  <%= link_to as_(:next), url_options.merge(:page => current_page.number + 1), options.merge(:class => "as_paginate next") if current_page.next? %>
-<% end -%>