active_scaffold 3.6.4.1 → 3.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335d7ad205e19c251d006398597bad619cc5499efa8a0815017cf27aa5df0b65
-  data.tar.gz: 940135dfbc68e1c3d70aa02132a3d9f3873162dc4964b6d9cdc04a2b73feed97
+  metadata.gz: 4d63c8ce5c055421403fdf35bce2cc09fa4797ad8ccf282fd0ab96b80a254b56
+  data.tar.gz: af6eea7aa4e45b55bfafcdc1c2cedbd2e3880bf71af800fd2720a291fde329a8
 SHA512:
-  metadata.gz: 436fed807f06fb66d908dd913a54f06173fb7304ebbb59ea15c0952165570c6fd16ba243794dc147140445beb9e03e9f6e28ca9564d5bedb402f28e2dbdd565e
-  data.tar.gz: 7dec63250eee9943823e9ffc14fd45ac7dd2edb5aef15f901a564ba0bc60101b93a41cfca09e58dd29936ef7aebe3e534adb9cfb850abdeb21bb88b7567b028d
+  metadata.gz: edd5caa3ba54351a67da98599a5bf684eb1e6cdc573c951a5318d25cbb6f36fceabfb963f0a6e4c64a21320c75aecfcefb07c6f4f049fd4f49a585ff3e74c09c
+  data.tar.gz: 7a1a1ed5fb94ded3584468ccec6ec7321d781f0ae90efd767a6723c8ff5cd29b11a5f67620599e32a44becd5c6ec322835056c5f1baf1430802c132db16f42c9

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+= 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
+
 = 3.6.4.1
 - Actually fix country_select bridge for latest gem version
 

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.map { |locale| Rails.root.join("config/locales/#{locale}.yml") }.select(&:exist?).each { |path| depend_on path.to_s } %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker;
 jQuery.extend(Object.getPrototypeOf(jQuery.datepicker), {

data/config/locales/de.yml

@@ -41,6 +41,7 @@ de:
       closeText: Schließen
       currentText: Jetzt
       timeText: Uhrzeit
+      timezoneText: Timezone
     days: Tage
     delete: Löschen
     deleted_model: "%{model} gelöscht"

data/config/locales/en.yml

@@ -41,6 +41,7 @@ en:
       closeText: Close
       currentText: Now
       timeText: Hour
+      timezoneText: Timezone
     days: Days
     delete: Delete
     deleted_model: Deleted %{model}

data/config/locales/es.yml

@@ -41,6 +41,7 @@ es:
       closeText: Cerrar
       currentText: Ahora
       timeText: Hora
+      timezoneText: Zona horaria
     days: Días
     delete: Borrar
     deleted_model: "%{model} borrado"

data/config/locales/fr.yml

@@ -41,6 +41,7 @@ fr:
       closeText: Fermer
       currentText: Maintenant
       timeText: Heure
+      timezoneText: Timezone
     days: Jours
     delete: Supprimer
     deleted_model: Suppression de %{model}

data/config/locales/hu.yml

@@ -40,7 +40,8 @@ hu:
     datetime_picker_options:
       closeText: 
       currentText: 
-      timeText: 
+      timeText:
+      timezoneText: Timezone
     days: Days
     delete: Törlés
     deleted_model: "%{model} törölve"

data/config/locales/ja.yml

@@ -40,7 +40,8 @@ ja:
     datetime_picker_options:
       closeText: 
       currentText: 
-      timeText: 
+      timeText:
+      timezoneText: Timezone
     days: Days
     delete: 削除
     deleted_model: "%{model}を削除しました"

data/config/locales/ru.yml

@@ -40,7 +40,8 @@ ru:
     datetime_picker_options:
       closeText: Закрыть
       currentText: Текущее время
-      timeText: 
+      timeText:
+      timezoneText: Timezone
     days: дней
     delete: Удалить
     deleted_model: "%{model}: запись удалена"

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -18,7 +18,8 @@ module ActiveScaffold::Bridges
         /%M/ => 'mm',
         /%p/ => 'tt',
         /%S/ => 'ss',
-        /%[cUWwxXZz]/ => ''
+        /%z/ => 'z',
+        /%[cUWwxXZ]/ => ''
       }.freeze
 
       def self.date_options_for_locales
@@ -82,13 +83,14 @@ module ActiveScaffold::Bridges
 
       def self.to_datepicker_format(rails_format)
         return nil if rails_format.nil?
-        if rails_format =~ /%[cUWwxXZz]/
+        unsupported = DATE_FORMAT_CONVERSION.index ''
+        if rails_format =~ unsupported
+          options = unsupported.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
           Rails.logger.warn(
             "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
             "which can't be converted to jquery datepicker format. "\
-            'Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed'
+            "Options #{options.join(', ')} are not supported by datepicker and will be removed"
           )
-          nil
         end
         js_format = rails_format.dup
         js_format.gsub!(/([ ]|^)([^% ]\S*)/, " '\\2'")

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

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