active_scaffold 3.6.6 → 3.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db4ded41b22bcb1ff0c1f9d2e59499bd37127ffc4600e53fc24856a9ef525897
-  data.tar.gz: e3b57c93d2250d0ac83f618ee38c04b8514d56817555bace633a2a9efb05d3ed
+  metadata.gz: 5450d62d32a21683b6226c4b1a23694e0dac270987c78e5a5a4452271a55fd08
+  data.tar.gz: ef18b964d35d5796b193c2ffde31698d33fd083a4d3fa03d3f486cef418aa9ef
 SHA512:
-  metadata.gz: c1a48c8654117d2829cdde939ab632b797287312dfe37fe88d73594b70ef2d48b4cac5872158fb56a090808daa6334310ab3ac8efc73de0109850760ed5673ee
-  data.tar.gz: 58052fce6e32e54e28cc3d77c43f2a952b32be8c6a314a07047537a1d3c62931476d30c787a0cd239329c099e8dbdff6032d31610fb93cd83e79192ec27c192d
+  metadata.gz: 84fbaee76d085ccf789bb610e99a652ecabf4c2158a5813a8dba2b493fafd97bf02be6743874942dea47a9b3067b361c534d4faf832e4c007ec854aaddd53b85
+  data.tar.gz: c4e5d788ae233d7c853a24d6cadfc2c1e81e963da2abcb763a453e9cb0ef01a7b028de8af45e2943e29784dcbace065b097ca7a396c3d9cc9bf444955e329987

data/CHANGELOG.rdoc

@@ -1,3 +1,20 @@
+= 3.6.10
+- Don't add numerical constraints based on conditional validation
+- Fix typo in cache key for numerical constraints
+- Fix duplicated params in search form, e.g. embedded constraints
+
+= 3.6.9
+- Support depend on .rb or .json locale files for date picker bridge
+- Fix search with dates entered with timezone in datepicker
+
+= 3.6.8
+- Add depend_on available translations in app to data picker bridge JS
+- Fix live search with rails-ujs
+- Replace delayedObserver with $.debounce
+
+= 3.6.7
+- Upgrade jquery ui timepicker addon to 1.6.3
+
 = 3.6.6
 - Fix format string for timezone in jquery timepicker
 

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

@@ -3,6 +3,7 @@
   when :jquery
     jquery_ui = true
     require_asset "getprototypeof"
+    require_asset "jquery.ba-throttle-debounce"
     if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION'
       require_asset "jquery-ui"
     elsif Jquery.const_defined? 'Ui'

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

@@ -354,6 +354,10 @@ jQuery(document).ready(function($) {
     }
   });
 
+  jQuery(document).on('input paste', 'form.search.live input[type=search]', $.debounce((ActiveScaffold.config.live_search_delay || 0.5) * 1000, function() {
+    jQuery(this).parent().find('[type=submit]').click();
+  }));
+
   jQuery(document).on('turbolinks:before-visit', function() {
     if (history.state.active_scaffold) {
       history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
@@ -459,44 +463,6 @@ jQuery(document).on('turbolinks:load', function($) {
   };
 })();
 
-/*
- $ delayed observer
- (c) 2007 - Maxime Haineault (max@centdessin.com)
-
- Special thanks to Stephen Goguen & Tane Piper.
-
- Slight modifications by Elliot Winkler
-*/
-
-if (typeof(jQuery.fn.delayedObserver) === 'undefined') {
-  (function($){
-    $.extend($.fn, {
-      delayedObserver: function(callback, delay, options){
-        return this.each(function(){
-          var el = $(this);
-          var op = options || {};
-          el.data('oldval', el.val())
-            .data('delay', delay === 0 ? delay : (delay || 0.5))
-            .data('condition', op.condition || function() { return ($(this).data('oldval') == $(this).val()); })
-            .data('callback', callback)
-            [(op.event||'keyup')](function(){
-              if (el.data('condition').apply(el)) { return; }
-              else {
-                if (el.data('timer')) { clearTimeout(el.data('timer')); }
-                el.data('timer', setTimeout(function(){
-                  var callback = el.data('callback')
-                  if (callback) callback.apply(el);
-                }, el.data('delay') * 1000));
-                el.data('oldval', el.val());
-              }
-            });
-          });
-      }
-    });
-  })(jQuery);
-};
-
-
 /*
  * Simple utility methods
  */
@@ -507,7 +473,6 @@ var ActiveScaffold = {
     /* setup some elements on page/form load */
     ActiveScaffold.load_embedded(container);
     ActiveScaffold.enable_js_form_buttons(container);
-    ActiveScaffold.live_search(container);
     ActiveScaffold.auto_paginate(container);
     ActiveScaffold.draggable_lists('.draggable-lists', container);
     ActiveScaffold.sliders(container);
@@ -530,11 +495,6 @@ var ActiveScaffold = {
     }
     ActiveScaffold.add_to_history(document.location.href, data, true);
   },
-  live_search: function(element) {
-    jQuery('form.search.live input[type=search]', element).delayedObserver(function() {
-     jQuery(this).parent().trigger("submit");
-    }, ActiveScaffold.config.live_search_delay || 0.5);
-  },
   auto_paginate: function(element) {
     var paginate_link = jQuery('.active-scaffold-pagination.auto-paginate a:first', element);
     if (paginate_link.length) {

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,4 +1,5 @@
 <%# encoding: utf-8 %>
+<% I18n.available_locales.each { |locale| Dir[Rails.root.join("config/locales/#{locale}.*")].each { |path| depend_on path } } %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker;
 jQuery.extend(Object.getPrototypeOf(jQuery.datepicker), {

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

@@ -14,7 +14,7 @@
   hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
 
-<%= form_tag url_options, options do %>
+<%= form_tag url_options.slice(:controller, :action, :id, :search), options do %>
   <% hidden_params.each do |pair| -%>
     <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
     <%= hidden_field_tag(key, value) %>

data/lib/active_scaffold/bridges/date_picker.rb

@@ -13,6 +13,10 @@ module ActiveScaffold::Bridges
       Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
     end
 
+    def self.stylesheets
+      'jquery-ui-timepicker-addon'
+    end
+
     def self.localization
       "jQuery(function($){
   if (typeof($.datepicker) === 'object') {

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -122,9 +122,9 @@ module ActiveScaffold
               if column.search_sql.is_a? Proc
                 column.search_sql.call(from_value, to_value, operator)
               elsif operator.nil?
-                ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
+                ['%<search_sql>s BETWEEN ? AND ?', from_value, to_value] unless from_value.nil? || to_value.nil?
               else
-                ["%<search_sql>s #{value['opt']} ?", from_value.to_s(:db)] unless from_value.nil?
+                ["%<search_sql>s #{value['opt']} ?", from_value] unless from_value.nil?
               end
             end
 

data/lib/active_scaffold/finder.rb

@@ -319,11 +319,11 @@ module ActiveScaffold
         if from_value.nil? && to_value.nil?
           nil
         elsif !from_value
-          ['%<search_sql>s <= ?', to_value.to_s(:db)]
+          ['%<search_sql>s <= ?', to_value]
         elsif !to_value
-          ['%<search_sql>s >= ?', from_value.to_s(:db)]
+          ['%<search_sql>s >= ?', from_value]
         else
-          ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)]
+          ['%<search_sql>s BETWEEN ? AND ?', from_value, to_value]
         end
       end
 

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -720,7 +720,9 @@ module ActiveScaffold
       # Try to get numerical constraints from model's validators
       def column_numerical_constraints(column, options)
         validators = column.active_record_class.validators.select do |v|
-          v.is_a?(ActiveModel::Validations::NumericalityValidator) && v.attributes.include?(column.name)
+          v.is_a?(ActiveModel::Validations::NumericalityValidator) &&
+            v.attributes.include?(column.name) &&
+            !v.options[:if] && !v.options[:unless]
         end
 
         equal_validator = validators.find { |v| v.options[:equal_to] }
@@ -770,7 +772,7 @@ module ActiveScaffold
       end
 
       def numerical_constraints_for_column(column, options)
-        constraints = Rails.cache.fetch("#{column.cache_key}#numerical_constarints") do
+        constraints = Rails.cache.fetch("#{column.cache_key}#numerical_constraints") do
           column_numerical_constraints(column, options)
         end
         constraints.merge(options)

data/lib/active_scaffold/version.rb

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