active_scaffold 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f13a22b391abab0509c40d617c528902fda68c27
-  data.tar.gz: a4bc30e40eb947290999544fcdec3cce07fe3236
+  metadata.gz: 0a8ff5ba84f3dc705d9828e90c74107b5d7956c0
+  data.tar.gz: 83d93e5cfce76fc8b5ffa04a72114e88a39ee6b3
 SHA512:
-  metadata.gz: 56f0cf576372ed2f10ddd03c6a798738237e5a3bda87e01d62b6bd3f8fe4831b7579589aa0fa50a6989c9b372e8e9c23dfd1643d682231fe356091e93f30c0d0
-  data.tar.gz: e8d69d8f3c33c9167829635378146560e2b771d8ab495db3adf2966d4af0061394594541020696f72b5cfb7f21577934656d26667288ba32abd318680ba7338c
+  metadata.gz: 0a1018479c9bab0ef13fbfe281c20a1fec953bb91403c06c69b38a9220b78b7e7d55d39cd28f9fb5bf36ae742e5947034415478ff0fd9157c560fe73cbb2a23e
+  data.tar.gz: d1b55a0ca9c756fd581aaaec5bdff972ad55942f8ea5d326e4e166dff35ea4c0ad4bebed3ff6df85275a7fb4872b1ebc4d7a2c8868b7bfb1954aa42ef7756dfb

data/CHANGELOG

@@ -1,4 +1,8 @@
-= 3.4.2 (not released yet)
+= 3.4.3
+- default search columns doesn't include association columns (broken on 3.4.2), it slowing down search with no point (searching by association's primary key)
+- More unobtrusive html views
+
+= 3.4.2
 - fix tableless on latest rails4 versions
 - respond with 406 for html request on js only actions
 - fix JS issue on IE8

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

@@ -224,6 +224,13 @@ jQuery(document).ready(function($) {
     } else value = form_element.is("input:checkbox:not(:checked)") ? null : form_element.val();
     ActiveScaffold.update_column(form_element, element.attr('href'), element.data('update_send_form'), form_element.attr('id'), value);
   });
+  jQuery(document).on('click', 'a.visibility-toggle', function(e) {
+    var link = jQuery(this), toggable = jQuery('#' + link.data('toggable'));
+    e.preventDefault();
+    toggable.toggle();
+    link.html((toggable.is(':hidden')) ? link.data('show') : link.data('hide'));
+    return false;
+  });
   jQuery(document).on('recordselect:change', 'input.recordselect.update_form', function(event, id, label) {
     var element = jQuery(this);
     ActiveScaffold.update_column(element, element.data('update_url'), element.data('update_send_form'), element.attr('id'), id);
@@ -279,14 +286,21 @@ jQuery(document).ready(function($) {
     e.preventDefault();
   });
   
+  /* setup some elements on page/form load */
+  ActiveScaffold.load_embedded(document);
+  ActiveScaffold.enable_js_form_buttons(document);
   ActiveScaffold.live_search(document);
   ActiveScaffold.auto_paginate(document);
-  ActiveScaffold.draggable_lists('.draggable-lists');
+  ActiveScaffold.draggable_lists('.draggable-lists', document);
   jQuery(document).on('as:element_updated', function(e) {
+    ActiveScaffold.load_embedded(e.target);
+    ActiveScaffold.enable_js_form_buttons(e.target);
     ActiveScaffold.live_search(e.target);
     ActiveScaffold.draggable_lists('.draggable-lists', e.target);
   });
   jQuery(document).on('as:action_success', 'a.as_action', function(e, action_link) {
+    ActiveScaffold.load_embedded(action_link.adapter);
+    ActiveScaffold.enable_js_form_buttons(action_link.adapter);
     ActiveScaffold.live_search(action_link.adapter);
     ActiveScaffold.auto_paginate(action_link.adapter);
     ActiveScaffold.draggable_lists('.draggable-lists', action_link.adapter);
@@ -415,6 +429,17 @@ var ActiveScaffold = {
   auto_load_page: function(href, params) {
     jQuery.get(href, params, null, 'script');
   },
+  enable_js_form_buttons: function(element) {
+    jQuery('.as-js-button', element).show();
+  },
+  load_embedded: function(element) {
+    $('.active-scaffold-component .load-embedded', element).each(function(index, item) {
+      item = jQuery(item);
+      item.closest('.active-scaffold-component').load(item.attr('href'), function() {
+        jQuery(this).trigger('as:element_updated');
+      });
+    });
+  },
 
   records_for: function(tbody_id) {
     if (typeof(tbody_id) == 'string') tbody_id = '#' + tbody_id;
@@ -455,10 +480,11 @@ var ActiveScaffold = {
   removeSortClasses: function(scaffold) {
     if (typeof(scaffold) == 'string') scaffold = '#' + scaffold;
     scaffold = jQuery(scaffold)
-    scaffold.find('td.sorted').each(function(element) {
-      element.removeClass("sorted");
+    scaffold.find('td.sorted').each(function(index, element) {
+      jQuery(element).removeClass("sorted");
     });
-    scaffold.find('th.sorted').each(function(element) {
+    scaffold.find('th.sorted').each(function(index, element) {
+      element = jQuery(element);
       element.removeClass("sorted");
       element.removeClass("asc");
       element.removeClass("desc");
@@ -735,21 +761,6 @@ var ActiveScaffold = {
     }
   },
   
-  create_visibility_toggle: function(element, options) {
-    if (typeof(element) == 'string') element = '#' + element;
-    var toggable = jQuery(element);
-    var toggler = toggable.prev();
-    var initial_label = (options.default_visible === true) ? options.hide_label : options.show_label;
-    
-    toggler.append(' <a class="visibility-toggle" href="#">' + initial_label + '</a>');
-    toggler.children('a').click(function(e) {
-      e.preventDefault();
-      toggable.toggle(); 
-      jQuery(this).html((toggable.is(':hidden')) ? options.show_label : options.hide_label);
-      return false;
-    });
-  },
-  
   create_associated_record_form: function(element, content, options) {
     if (typeof(element) == 'string') element = '#' + element;
     var element = jQuery(element);
@@ -953,11 +964,11 @@ var ActiveScaffold = {
     });
   },
   
-  draggable_lists: function(id_or_elements) {
+  draggable_lists: function(selector_or_elements, parent) {
     var elements;
     if (!jQuery.fn.draggableLists) return;
-    if (typeof(id_or_elements) == 'string') elements = jQuery('ul' + id_or_elements);
-    else elements = jQuery(elements);
+    if (typeof(selector_or_elements) == 'string') elements = jQuery('ul' + selector_or_elements, parent);
+    else elements = jQuery(selector_or_elements);
     elements.draggableLists();
   }
 }

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

@@ -284,6 +284,13 @@ document.observe("dom:loaded", function() {
     } else value = form_element.getValue();
     ActiveScaffold.update_column(form_element, element.readAttribute('href'), element.hasAttribute('data-update_send_form'), form_element.readAttribute('id'), value);
   });
+  document.on('click', 'a.visibility-toggle', function(event) {
+    event.stop();
+    var link = event.findElement();
+    var toggable = $(link.readAttribute('data-toggable'));
+    toggable.toggle();
+    link.innerHTML = (toggable.style.display == 'none') ? link.readAttribute('data-show') : link.readAttribute('data-hide');
+  });
   document.on('recordselect:change', 'input.recordselect.update_form', function(event) {
     var element = event.findElement();
     ActiveScaffold.update_column(element, element.readAttribute('data-update_url'), element.hasAttribute('data-update_send_form'), element.readAttribute('id'), element.memo.id);
@@ -330,6 +337,27 @@ document.observe("dom:loaded", function() {
     ActiveScaffold.hide(element.up('.message'));
     event.stop();
   });
+  
+  /* setup some elements on page/form load */
+  ActiveScaffold.load_embedded(document);
+  ActiveScaffold.enable_js_form_buttons(document);
+  ActiveScaffold.live_search(document);
+  ActiveScaffold.auto_paginate(document);
+  ActiveScaffold.draggable_lists('.draggable-lists', document);
+  document.on('as:element_updated', function(e) {
+    var target = event.findElement();
+    ActiveScaffold.load_embedded(target);
+    ActiveScaffold.enable_js_form_buttons(target);
+    ActiveScaffold.live_search(target);
+    ActiveScaffold.draggable_lists('.draggable-lists', target);
+  });
+  document.on('as:action_success', 'a.as_action', function(e, action_link) {
+    ActiveScaffold.load_embedded(action_link.adapter);
+    ActiveScaffold.enable_js_form_buttons(action_link.adapter);
+    ActiveScaffold.live_search(action_link.adapter);
+    ActiveScaffold.auto_paginate(action_link.adapter);
+    ActiveScaffold.draggable_lists('.draggable-lists', action_link.adapter);
+  });
 });
 
 
@@ -338,6 +366,38 @@ document.observe("dom:loaded", function() {
  */
 
 var ActiveScaffold = {
+  live_search: function(element) {
+    $$('form.search.live input[type=search]', element).each(function(item) {
+      new Form.Element.DelayedObserver(item, 0.5, function(element, value) {
+        if (!$(element.id)) return false; // because the element may have been destroyed
+        $(element).next().click();
+      });
+    });
+  },
+  auto_paginate: function(element) {
+    var paginate_link = $(element).select('.active-scaffold-pagination.auto-paginate a:first');
+    if (paginate_link.length) {
+      $(element).select('.active-scaffold-pagination.auto-paginate').invoke('hide');
+      ActiveScaffold.auto_load_page(paginate_link.readAttribute('href'), {auto_pagination: true});
+    }
+  },
+  auto_load_page: function(href, params) {
+    new Ajax.Request(href, {
+      method: 'get',
+      parameters: params,
+      asynchronous: true,
+      evalScripts: true
+    });
+  },
+  enable_js_form_buttons: function(element) {
+    $(element).select('.as-js-button').invoke('show');
+  },
+  load_embedded: function(element) {
+    $(element).select('.active-scaffold-component .load-embedded').each(function(item) {
+      new Ajax.Updater(item.up('.active-scaffold-component'), item.readAttribute('href'), {method: 'get', evalScripts: true});
+    });
+  },
+  
   records_for: function(tbody_id) {
     var rows = [];
     var child = $(tbody_id).down('.record');
@@ -627,21 +687,6 @@ var ActiveScaffold = {
     span.inplace_edit.enterEditMode();
   },
   
-  create_visibility_toggle: function(element, options) {
-    var toggable = $(element);
-    var toggler = toggable.previous();
-    var initial_label = (options.default_visible === true) ? options.hide_label : options.show_label;
-    
-    toggler.insert(' <a class="visibility-toggle" href="#">' + initial_label + '</a>');
-    toggler.firstDescendant().observe('click', function(event) {
-      var element = event.element();
-      event.stop();
-      toggable.toggle(); 
-      element.innerHTML = (toggable.style.display == 'none') ? options.show_label : options.hide_label;
-      return false;
-    });
-  },
-  
   create_associated_record_form: function(element, content, options) {
     var element = $(element);
     if (options.singular == false) {
@@ -756,8 +801,13 @@ var ActiveScaffold = {
     });
   },
   
-  draggable_lists: function(element) {
-    new DraggableLists(element);
+  draggable_lists: function(selector_or_elements, parent) {
+    var elements;
+    if (typeof(selector_or_elements) == 'string') elements = $(parent).select('ul' + selector_or_elements);
+    else elements = $A($(selector_or_elements));
+    elements.each(function(item) {
+      new DraggableLists(item);
+    });
   },
 
   highlight: function(element) {

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

@@ -13,13 +13,16 @@ form_tag url_options, options %>
     <% end -%>
     <% unless hiddens.empty?  -%>
       <li class="sub-section">
-      <h5><%= as_(:optional_attributes) %></h5>
-      <ol id ="<%= sub_section_id(:sub_section => 'further_options') %>" class="form" style="display:none;">
+      <% further_options_id = sub_section_id(:sub_section => 'further_options') %>
+      <h5>
+        <%= as_(:optional_attributes) %>
+        <%= link_to_visibility_toggle(further_options_id, {:default_visible => false}) %>
+      </h5>
+      <ol id ="<%= further_options_id %>" class="form" style="display:none;">
       <% hiddens.each do |column| -%>
         <li class="form-element"><%= search_attribute(column, @record) %></li>
       <% end -%>
       </ol>
-      <%= link_to_visibility_toggle(sub_section_id(:sub_section => 'further_options'), {:default_visible => false}) %>
       </li>
   <% end -%>
   </ol>

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

@@ -12,9 +12,11 @@
   <% if authorized %>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
   <li class="sub-section <%= column_css_class %>">
-    <h5><%= column.label %></h5>
+    <h5>
+      <%= column.label %>
+      <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
+    </h5>
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id, :form_action => form_action, :scope => scope } %>
-    <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
   <% end %>
   <% elsif renders_as == :subform and authorized -%>

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

@@ -10,14 +10,16 @@ disable_required_for_new = @disable_required_for_new
 @disable_required_for_new = !!show_blank_record unless (column.singular_association? && column.required?)
 subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999)}-div" 
 -%>
-<h5><%= column.label -%></h5>
+<h5>
+  <%= column.label -%>
+  <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
+</h5>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
 <%# HACK to be able to delete all associated records %>
   <%= hidden_field_tag "#{active_scaffold_input_options(column, scope, :object => parent_record)[:name]}[0]", '' if column.plural_association? %>
   <%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
   <%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope} -%>
 </div>
-<%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
 <%
   @record = parent_record # restore @record, some partials can change it TODO remove when changing @record is removed
   @disable_required_for_new = disable_required_for_new

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

@@ -28,8 +28,7 @@ add_new_url = params_for(:controller => controller_path, :action => 'edit_associ
          add_class = 'as_replace_with_new'
        end
        create_another_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-create-another" %>
-    <%= link_to add_label, add_new_url, :id => create_another_id, :remote => true, :class => add_class, :style=> "display: none;" %>
-    <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
+    <%= link_to add_label, add_new_url, :id => create_another_id, :remote => true, :class => "as-js-button #{add_class}", :style=> "display: none;" %>
     <% end -%>
 
     <%= '|' if show_add_new and show_add_existing %>
@@ -42,8 +41,7 @@ add_new_url = params_for(:controller => controller_path, :action => 'edit_associ
            add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"
            add_existing_label = column.plural_association? ? :add_existing : :replace_existing %>
         <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
-        <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "as_#{add_existing_label}", :style => "display: none;" %>
-        <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
+        <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "subform-button as_#{add_existing_label}", :style => "display: none;" %>
       <% end -%>
     <% end -%>
   </div>

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

@@ -12,17 +12,3 @@ options = {:id => element_form_id(:action => 'search'),
   <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} %>
   <%= loading_indicator_tag(:action => :search) %>
 </form>
-
-<% if ActiveScaffold.js_framework == :prototype %>
-<script type="text/javascript">
-//<![CDATA[
-  new TextFieldWithExample('<%= search_input_id %>', '<%= as_(live_search ? :live_search : :search_terms) %>', {focus: true});
-<% if live_search -%>
-  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 -%>
-//]]>
-</script>
-<% end -%>

data/lib/active_scaffold/config/search.rb

@@ -41,7 +41,7 @@ module ActiveScaffold::Config
     def columns
       # we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
       unless @columns
-        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.text?}.compact
+        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.association.nil? and c.text?}.compact
       end
       @columns
     end

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -75,12 +75,7 @@ module ActionView::Helpers #:nodoc:
             # might be a namespaced controller (e.g., 'admin/admins')
             model = remote_controller.to_s.sub(/.*\//, '').singularize
             content_tag(:div, :class => 'active-scaffold-header') do
-              content_tag :h2, link_to(args.first[:label] || active_scaffold_config_for(model).list.label, url, :remote => true)
-            end <<
-            if ActiveScaffold.js_framework == :prototype
-              javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
-            elsif ActiveScaffold.js_framework == :jquery
-              javascript_tag("jQuery('##{id}').load('#{url}', function() { jQuery(this).trigger('as:element_updated'); });")
+              content_tag :h2, link_to(args.first[:label] || active_scaffold_config_for(model).list.label, url, :remote => true, :class => 'load-embedded')
             end
           end
         end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -320,7 +320,6 @@ module ActiveScaffold
           end
           content
         end
-        html << javascript_tag("ActiveScaffold.draggable_lists('#{options[:id]}')") if column.options[:draggable_lists] && ActiveScaffold.js_framework == :prototype
         html
       end
 

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -80,7 +80,7 @@ module ActiveScaffold
         options[:default_visible] = true if options[:default_visible].nil?
         options[:hide_label] ||= as_(:hide) 
         options[:show_label] ||= as_(:show_block)
-        javascript_tag("ActiveScaffold.create_visibility_toggle('#{id}', #{options.to_json});")
+        link_to options[:default_visible] ? options[:hide_label] : options[:show_label], '#', :data => {:show => options[:show_label], :hide => options[:hide_label], :toggable => id}, :style => 'display: none;', :class => 'as-js-button visibility-toggle'
       end
 
       def skip_action_link?(link, *args)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 2
+    PATCH = 3
 
     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.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda