active_scaffold 3.4.23 → 3.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7165870ea614c4b6716d2e3471179817ddff211
-  data.tar.gz: d8cf35a1036360fc2f78e061b1f1e34d54b4449f
+  metadata.gz: dc9178690751a9ba0c8d602ed0d2e133dcb42d67
+  data.tar.gz: 9a27c060e1b4953701409cc4c550b15cfe48f428
 SHA512:
-  metadata.gz: 85707d87e834e46b05a286db1dd795980c9329c53563d28238a69e459a72a7825d2faf78ff55898d0cf58b4180932d5cd4eafba81c9ca62a743e5ea23d0a3884
-  data.tar.gz: 262c83c84c084418072a6706d9db22b0f9d04d93b5fa6fa4be552b386663ffd18f2c3b2ca252cf039f2e302ea7fc4c5c0d44ba954d9d63bab349d6a2deebb70b
+  metadata.gz: 483dd99adb6c1f300474b5eecb0ae5377428d901896d79889b205525ba37691afe7781e6854300d6acfdd635d4cf3220afdf008a19e120ea7df89bc4d9426760
+  data.tar.gz: b32f74e9882bc164bf6b42f613e0106dd21dc1df54eada67234198834fbc881b0f357c3af50ca1993a5462cfd3bad7fca31c897cb78a3d8bdc490044e22547ef

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 3.4.24
+- allow to set :controller in active_scaffold_record_select_autocomplete parameter or active_scaffold_input_text_options
+- fix keeping focus after update_columns when focus was changed to a field which is going to be updated
+- no autofocus first input if is inside .no-autofocus tag
+- use active_scaffold_enum_options on select search_ui
+- add submit_text option for field_search and search partials
+
 = 3.4.23
 - fix chosen on new subform rows
 - add show_ui to column

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

@@ -612,7 +612,9 @@ var ActiveScaffold = {
   focus_first_element_of_form: function(form_element, form_selector) {
     if (typeof(form_element) == 'string') form_element = '#' + form_element;
     if (typeof(form_selector) == 'undefined') form_selector = jQuery(form_element).is('form') ? '' : 'form ';
-    var input = jQuery(form_selector + ":input:visible:first", jQuery(form_element)).focus();
+    var input = jQuery(form_selector + ":input:visible:first", jQuery(form_element));
+    if (input.is('.no-autofocus :input')) return;
+    input.focus();
     try { if (input[0] && input[0].value) input[0].selectionStart = input[0].selectionEnd = input[0].value.length; } catch(e) {}
   },
 
@@ -972,7 +974,11 @@ var ActiveScaffold = {
         element = as_form.find('#'+element.attr('id'));
         element.nextAll('img.loading-indicator').css('visibility','hidden');
         element.trigger('ajax:complete', [xhr, status]);
-        if (ActiveScaffold.last_focus) jQuery(ActiveScaffold.last_focus).focus().select();
+        if (ActiveScaffold.last_focus) {
+          var item = jQuery(ActiveScaffold.last_focus);
+          if (item.closest('body').length == 0 && item.attr('id')) item = jQuery('#' + item.attr('id'));
+          item.focus().select();
+        }
       },
       error: function (xhr, status, error) {
         element = as_form.find('#'+element.attr('id'));

data/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -1,11 +1,15 @@
-<% url_options ||= params_for(:action => :index, :search => nil) -%>
-<%=
-options = {:id => element_form_id(:action => 'search'),
-           :class => "as_form search",
-           :remote => xhr ||= request.xhr?,
-           :method => :get,
-           'data-loading' => true}
-form_tag url_options, options %>
+<%
+  url_options ||= params_for(:action => :index, :search => nil)
+  submit_text ||= :search
+  options = {
+    :id => element_form_id(:action => 'search'),
+    :class => "as_form search",
+    :remote => xhr ||= request.xhr?,
+    :method => :get,
+    :'data-loading' => true
+  }
+-%>
+<%= form_tag url_options, options %>
   <ol class="form">
    <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>
@@ -27,7 +31,7 @@ form_tag url_options, options %>
   <% end -%>
   </ol>
   <p class="form-footer">
-    <%= submit_tag as_(:search), :class => "submit" %>
+    <%= submit_tag as_(submit_text), :class => "submit" %>
     <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -1,14 +1,18 @@
-<% live_search = active_scaffold_config.search.live? -%>
-<% url_options =  params_for(:action => :index).delete_if{|k,v| k == 'search'} -%>
-<%=
-options = {:id => element_form_id(:action => 'search'),
-           :class => "as_form search#{' live' if live_search}",
-           :remote => xhr ||= request.xhr?,
-           :'data-loading' => true,
-           :method => :get}
-  form_tag url_options, options %>
+<%
+  live_search = active_scaffold_config.search.live?
+  url_options =  params_for(:action => :index).delete_if{|k,v| k == 'search'}
+  submit_text ||= :search
+  options = {
+    :id => element_form_id(:action => 'search'),
+    :class => "as_form search#{' live' if live_search}",
+    :remote => xhr ||= request.xhr?,
+    :'data-loading' => true,
+    :method => :get
+  }
+-%>
+<%= form_tag url_options, options do %>
   <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
-  <%= submit_tag as_(:search), :class => "submit", :style => ('display:none;' if live_search) %>
+  <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
   <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
   <%= loading_indicator_tag(:action => :search) %>
-</form>
+<% end %>

data/lib/active_scaffold/bridges/record_select/helpers.rb

@@ -60,7 +60,7 @@ class ActiveScaffold::Bridges::RecordSelect
       end
 
       def active_scaffold_record_select_autocomplete(record, column, options)
-        record_select_options = active_scaffold_input_text_options(options).merge(
+        record_select_options = active_scaffold_input_text_options(options).reverse_merge(
           :controller => active_scaffold_controller_for(record.class).controller_path
         ).merge(column.options)
         html = record_select_autocomplete(options[:name], record, record_select_options)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -103,7 +103,7 @@ module ActiveScaffold
           select_options = sorted_association_options_find(column.association, false, record)
         else
           method = column.name
-          select_options = column.options[:options].collect do |text, value|
+          select_options = active_scaffold_enum_options(column, record).collect do |text, value|
             active_scaffold_translated_option(column, text, value)
           end
         end

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.23
+  version: 3.4.24
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman