effective_datatables 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c540b23d9f98ea45c144088577103ea0c495ea7
-  data.tar.gz: a61e210447bb08fe4c40282a283c4c9881e8b5f9
+  metadata.gz: 3597f4d25da2086e8dc75eadb9b7357dcc8d6f07
+  data.tar.gz: 0d9d78236679a654433fd819c8048ca790648f40
 SHA512:
-  metadata.gz: a179b5653c8b9f07dd3b08fb2631da06e6d6d249241e17826b700e9b1ffca7efc5cf9b36f80dea09de4651934e69220f51404743ac05c228fb7077a994d43b4d
-  data.tar.gz: 225185be2373c71dd8142791a7ccf059f4e2cf1f508d3edbdb1e57143832a286b9a28f7e410143990a5446523608d1eeb4459bb7f2bc19e0ef883c6227fb86c9
+  metadata.gz: 9c12a4f93799e423db3c1e2c01de77cb8da0466b20bc058dccdefc09c60215142a76c315133250869705e186f228b46a57790d07be5c1c9bbee3eb359d03e5de
+  data.tar.gz: 9bbafa5c6a4932195877834860073c4a9b28b1d27ca7a14526cedeaccf6ffc0fe4e6b5cac9fd3ce966d21aa103fcfa9bc243a3e361fbe381f5e1e7590ffe20d3

data/app/assets/javascripts/effective_datatables/bulk_actions.js.coffee

@@ -1,22 +1,23 @@
 #### Checkbox toggling and Bulk Actions dropdown disabling
 
 $(document).on 'change', "input[data-role='bulk-actions-resource']", (event) ->
-  $("input[data-role='bulk-actions-all']").prop('checked', false)
-  toggleClosestBulkActionsButton($(event.currentTarget))
+  $wrapper = $(event.currentTarget).closest('.dataTables_wrapper')
+
+  $wrapper.find("input[data-role='bulk-actions-all']").prop('checked', false)
+  toggleClosestBulkActionsButton($wrapper)
 
 $(document).on 'change', "input[data-role='bulk-actions-all']", (event) ->
-  $checkAll = $(event.currentTarget)
-  $resources = $("input[data-role='bulk-actions-resource']")
+  $wrapper = $(event.currentTarget).closest('.dataTables_wrapper')
+  $resources = $wrapper.find("input[data-role='bulk-actions-resource']")
 
-  if $checkAll.is(':checked')
+  if $(event.currentTarget).is(':checked')
     $resources.prop('checked', true)
   else
     $resources.prop('checked', false)
 
-  toggleClosestBulkActionsButton($checkAll)
+  toggleClosestBulkActionsButton($wrapper)
 
-toggleClosestBulkActionsButton = (element) ->
-  $wrapper = element.closest('.dataTables_wrapper')
+toggleClosestBulkActionsButton = ($wrapper) ->
   $bulkActions = $wrapper.children().first().find('.buttons-bulk-actions').children('button')
 
   if $wrapper.find("input[data-role='bulk-actions-resource']:checked").length > 0

data/app/assets/javascripts/effective_datatables/initialize.js.coffee

@@ -140,15 +140,14 @@ initializeDataTables = ->
         $input.parent().on 'mousedown', (event) -> event.stopPropagation() # Dont order columns when you click inside the input
 
         if $input.is('select')
-          $input.on 'change', (event) -> dataTableSearch(event)
+          $input.on 'change', (event) -> dataTableSearch($(event.currentTarget))
         else if $input.is('input')
-          $input.keyup($.debounce(300, dataTableSearch))
+          $input.delayedChange ($input) -> dataTableSearch($input)
 
     # Do the actual search
-    dataTableSearch = (event) ->   # This is the function called by a select or input to run the search
-      obj = $(event.currentTarget)
-      table = obj.closest('table.dataTable')
-      table.DataTable().column("#{obj.data('column-name')}:name").search(obj.val()).draw()
+    dataTableSearch = ($input) ->   # This is the function called by a select or input to run the search
+      table = $input.closest('table.dataTable')
+      table.DataTable().column("#{$input.data('column-name')}:name").search($input.val()).draw()
 
     if simple
       init_options['dom'] = "<'row'<'col-sm-12'tr>>" # Just show the table

data/app/assets/javascripts/effective_datatables.js

@@ -1,4 +1,4 @@
-//= require vendor/jquery.debounce.min
+//= require vendor/jquery.delayedChange
 //= require vendor/jszip.min
 
 //= require dataTables/jquery.dataTables.min

data/app/assets/javascripts/vendor/jquery.delayedChange.js

@@ -0,0 +1,38 @@
+// http://stackoverflow.com/questions/7373023/throttle-event-calls-in-jquery
+
+(function($) {
+  $.fn.delayedChange = function(options) {
+    var timer; var o;
+
+    if (jQuery.isFunction(options)) {
+      o = { onChange: options };
+    } else {
+      o = options;
+    }
+
+    o = $.extend({}, $.fn.delayedChange.defaultOptions, o);
+
+    return this.each(function() {
+      var element = $(this);
+      element.keyup(function() {
+        clearTimeout(timer);
+        timer = setTimeout(function() {
+          var newVal = element.val();
+          newVal = $.trim(newVal);
+          if (element.delayedChange.oldVal != newVal) {
+            element.delayedChange.oldVal = newVal;
+            o.onChange.call(this, element);
+          }
+        }, o.delay);
+      });
+    });
+  };
+
+  $.fn.delayedChange.defaultOptions = {
+    delay: 700,
+    onChange: function(element) { }
+  }
+
+  $.fn.delayedChange.oldVal = '';
+
+})(jQuery);

data/app/helpers/effective_datatables_helper.rb

@@ -77,13 +77,10 @@ module EffectiveDatatablesHelper
     bulk_actions_column = datatable.table_columns.find { |_, options| options[:bulk_actions_column] }.try(:second)
     return false unless bulk_actions_column
 
-    # This sets content_for(:effective_datatables_bulk_actions) as per the 3 bulk_action methods below
-    instance_exec(&bulk_actions_column[:dropdown_block]) if bulk_actions_column[:dropdown_block].respond_to?(:call)
-
     {
       dropdownHtml: render(
         partial: bulk_actions_column[:dropdown_partial],
-        locals: HashWithIndifferentAccess.new(datatable: datatable).merge(bulk_actions_column[:partial_locals])
+        locals: { datatable: datatable, dropdown_block: bulk_actions_column[:dropdown_block] }.merge(bulk_actions_column[:partial_locals])
       )
     }.to_json()
   end
@@ -156,17 +153,4 @@ module EffectiveDatatablesHelper
     attributes[:active_admin_path] rescue false
   end
 
-  ### Bulk Actions DSL Methods
-  def bulk_action(*args)
-    content_for(:effective_datatables_bulk_actions) { content_tag(:li, link_to(*args)) }
-  end
-
-  def bulk_action_divider
-    content_for(:effective_datatables_bulk_actions) { content_tag(:li, '', class: 'divider', role: 'separator') }
-  end
-
-  def bulk_action_content(&block)
-    content_for(:effective_datatables_bulk_actions) { block.call }
-  end
-
 end

data/app/models/effective/datatable.rb

@@ -8,6 +8,7 @@ module Effective
     delegate :render, :controller, :link_to, :mail_to, :number_to_currency, :number_to_percentage, :to => :@view
 
     extend Effective::EffectiveDatatable::Dsl
+    include Effective::EffectiveDatatable::Dsl::BulkActions
     include Effective::EffectiveDatatable::Dsl::Charts
     include Effective::EffectiveDatatable::Dsl::Datatable
     include Effective::EffectiveDatatable::Dsl::Scopes
@@ -145,14 +146,18 @@ module Effective
       @view.class.send(:attr_accessor, :effective_datatable)
       @view.effective_datatable = self
 
-      (self.class.instance_methods(false) - [:collection, :search_column, :order_column]).each do |view_method|
-        @view.class_eval { delegate view_method, to: :@effective_datatable }
+      unless @view.respond_to?(:bulk_action)
+        @view.class.send(:include, Effective::EffectiveDatatable::Dsl::BulkActions)
       end
 
       Effective::EffectiveDatatable::Helpers.instance_methods(false).each do |helper_method|
         @view.class_eval { delegate helper_method, to: :@effective_datatable }
       end
 
+      (self.class.instance_methods(false) - [:collection, :search_column, :order_column]).each do |view_method|
+        @view.class_eval { delegate view_method, to: :@effective_datatable }
+      end
+
       # Clear the search_terms memoization
       @search_terms = nil
       @order_name = nil

data/app/models/effective/effective_datatable/dsl/bulk_actions.rb

@@ -0,0 +1,22 @@
+module Effective
+  module EffectiveDatatable
+    module Dsl
+      module BulkActions
+        # These get added into the view as helpers
+        # To be called inside datatable { bulk_actions_column do .. end }
+        def bulk_action(*args)
+          concat content_tag(:li, link_to(*args))
+        end
+
+        def bulk_action_divider
+          concat content_tag(:li, '', class: 'divider', role: 'separator')
+        end
+
+        def bulk_action_content(&block)
+          concat block.call
+        end
+
+      end
+    end
+  end
+end

data/app/views/effective/datatables/_bulk_actions_dropdown.html.haml

@@ -3,8 +3,9 @@
     Bulk Actions
     %span.caret
   %ul.dropdown-menu
-    - if content_for?(:effective_datatables_bulk_actions)
-      = yield :effective_datatables_bulk_actions
+    - if dropdown_block.respond_to?(:call)
+      = capture do
+        - instance_exec(&dropdown_block)
     - else
       %li
         %a{href: '#'} No bulk actions

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '2.6.0'.freeze
+  VERSION = '2.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ files:
 - app/assets/javascripts/effective_datatables/initialize.js.coffee
 - app/assets/javascripts/effective_datatables/responsive.js.coffee
 - app/assets/javascripts/effective_datatables/scopes.js.coffee
-- app/assets/javascripts/vendor/jquery.debounce.min.js
+- app/assets/javascripts/vendor/jquery.delayedChange.js
 - app/assets/javascripts/vendor/jszip.min.js
 - app/assets/stylesheets/dataTables/buttons/buttons.bootstrap.min.css
 - app/assets/stylesheets/dataTables/buttons/buttons.dataTables.min.css
@@ -146,6 +146,7 @@ files:
 - app/models/effective/effective_datatable/ajax.rb
 - app/models/effective/effective_datatable/charts.rb
 - app/models/effective/effective_datatable/dsl.rb
+- app/models/effective/effective_datatable/dsl/bulk_actions.rb
 - app/models/effective/effective_datatable/dsl/charts.rb
 - app/models/effective/effective_datatable/dsl/datatable.rb
 - app/models/effective/effective_datatable/dsl/scopes.rb

data/app/assets/javascripts/vendor/jquery.debounce.min.js

@@ -1,9 +0,0 @@
-/*
- * jQuery throttle / debounce - v1.1 - 3/7/2010
- * http://benalman.com/projects/jquery-throttle-debounce-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function(b,c){var $=b.jQuery||b.Cowboy||(b.Cowboy={}),a;$.throttle=a=function(e,f,j,i){var h,d=0;if(typeof f!=="boolean"){i=j;j=f;f=c}function g(){var o=this,m=+new Date()-d,n=arguments;function l(){d=+new Date();j.apply(o,n)}function k(){h=c}if(i&&!h){l()}h&&clearTimeout(h);if(i===c&&m>e){l()}else{if(f!==true){h=setTimeout(i?k:l,i===c?e-m:e)}}}if($.guid){g.guid=j.guid=j.guid||$.guid++}return g};$.debounce=function(d,e,f){return f===c?a(d,e,false):a(d,f,e!==false)}})(this);