active_scaffold 3.6.5 → 3.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9669748f60be5817e4e654db635763351b986b914e85aff89d5b04b3f6ffe848
-  data.tar.gz: 55a24b6c7ef8e4ac5e517db0d559fbdba43ba055c6eaaa5a5c70e73baa935841
+  metadata.gz: e1e1f178ccfe11c704e5064d0ee50bfa6a27d6aee4f478f478e6e0529a7e0683
+  data.tar.gz: de3fb5ad387969bc8c796ca9db23de2f311e8b16f6002316456b475953d66ae1
 SHA512:
-  metadata.gz: 16dddca354bfaf6dcaa405f4dacb89c402563d06df115dc74ffba41d39e9ff8dadebaf4ec9b63a2a2830f1887ad43f640bd0873fede81c392c96fa5e06b128ac
-  data.tar.gz: 0cc2b4014d79082b8d1f704913f1d22c4876072e3608ffef0dd27f38d237021ee607b280142ee0d5c4402020b3a9533eda56f19d6a0788d5ae27c18cc16ea073
+  metadata.gz: 175f49bcb07a4fd3fd313f5437b3d2b438a20d9a697e2cc481fcc7086a4a0add3e08fa342ed90f984fed13eff68bad632b8bd772bbbf6869319d1024ace9082d
+  data.tar.gz: 8db9c02a65266fc858910ecf180800c4adabe0913eb02cb3464db665f51ad3ab3230a5bc1e6d38a581d93a874d390e6e8fa7ae7f72ec5c09d54cbecfcb070a71

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+- 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
+
 = 3.6.5
 - Support 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/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -18,7 +18,7 @@ module ActiveScaffold::Bridges
         /%M/ => 'mm',
         /%p/ => 'tt',
         /%S/ => 'ss',
-        /%z/ => 'Z',
+        /%z/ => 'z',
         /%[cUWwxXZ]/ => ''
       }.freeze
 

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/version.rb

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