effective_datatables 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d15e87f91c336f09837c05c1cd19ae3eb109aa5c
-  data.tar.gz: 02baa43cac7e7ecb1b0dbdee89d22512e98af70a
+  metadata.gz: b6617dd89c63c469a1b13e5cc33d42d17d38f485
+  data.tar.gz: 35c4b532d397f4b39a44b4f48cca0014ff9c88b2
 SHA512:
-  metadata.gz: 4df1c018bc13eb6bfe06a9309b52081dfe5f7840fc136a7d9b31d8ac06d8d1fde0c1ea1e66bbee7a3616238fba866f9eb572e3c75d7b8ffb451b33411e1dc4fb
-  data.tar.gz: 6daf450e7860fa17e318c1b29e65b3cad892eb3b94fc235186db44b3c31073c9c08621b3c9963b21a3bae29fc602dc54939645946df68ae34be87f7c8e79b4dd
+  metadata.gz: 408903d12b738461044519d44a608f1d231b153098d699fb37ef85010feb0d746d74a924bd437dcfe8f5affde12267230bb56ba9e1bde4f45348e6319d764a30
+  data.tar.gz: ca62715eec66e12d5dfc332c712ee3fb6c36dcb3aea938dc186a49f6af379e564d69c827f746fc539626a40f8d37005cf0293988ed3983ac13a918dea7db99a8

data/README.md

@@ -189,7 +189,7 @@ class PostsDatatable < Effective::Datatable
   # The user's selected filters, search, sort, length, column visibility and pagination settings are saved between visits
   # on a per-table basis and can be Reset with a button
   datatable do
-    length 25  # 5, 10, 25, 50, 100, 1000, :all
+    length 25  # 5, 10, 25, 50, 100, 500, :all
     order :updated_at, :desc
 
     # Renders a column of checkboxes to select items for any bulk_actions
@@ -559,7 +559,7 @@ The `glyphicon_to` helper is part of the [effective_resources](https://github.co
 
 ### length
 
-Sets the default number of rows per page. Valid lengths are `5`, `10`, `25`, `50`, `100`, `250`, `1000`, `:all`
+Sets the default number of rows per page. Valid lengths are `5`, `10`, `25`, `50`, `100`, `250`, `500`, `:all`
 
 When not specified, effective_datatables uses the default as per the `config/initializers/effective_datatables.rb` or 25.
 

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

@@ -49,10 +49,10 @@ initializeDataTables = ->
       deferLoading: [datatable.data('display-records'), datatable.data('total-records')]
       deferRender: true
       displayStart: datatable.data('display-start')
-      dom: "<'row'<'col-sm-12'B>><'row'<'col-sm-12'tr>><'row'<'col-sm-2'l><'col-sm-4'i><'col-sm-6'p>>"
+      dom: "<'row'<'col-sm-12'B>><'row'<'col-sm-12'tr>><'row'<'col-sm-6 dataTables_entries'il><'col-sm-6'p>>"
       iDisplayLength: datatable.data('display-length')
-      language: { 'lengthMenu': '_MENU_ per page'}
-      lengthMenu: [[10, 25, 50, 100, 250, 1000, 9999999], ['10', '25', '50', '100', '250', '1000', 'All']]
+      language: { 'lengthMenu': '&nbsp;with _MENU_ per page'}
+      lengthMenu: [[10, 25, 50, 100, 250, 500, 9999999], ['10', '25', '50', '100', '250', '500', 'All']]
       order: datatable.data('display-order')
       processing: true
       responsive: true
@@ -185,7 +185,7 @@ initializeDataTables = ->
 
     # Apply EffectiveFormInputs to the Show x per page dropdown
     if datatable.data('effective-form-inputs')
-      try table.closest('.dataTables_wrapper').find('.dataTables_length select').removeAttr('name').select2()
+      try table.closest('.dataTables_wrapper').find('.dataTables_length select').removeAttr('name').select2(minimumResultsForSearch: 100)
 
 destroyDataTables = ->
   $('table.effective-datatable').each ->

data/app/assets/stylesheets/effective_datatables/_overrides.scss

@@ -68,10 +68,38 @@ div.dataTables_wrapper div.dataTables_processing {
   width: 70%;
 }
 
-// Show x per page
-.dataTables_wrapper div.dataTables_length {
+// Datatables entries
+@media screen and (max-width: 767px) {
+  div.dataTables_wrapper div.dataTables_entries { text-align: center; }
+}
+
+.dataTables_wrapper .dataTables_entries {
   color: #909090;
   font-size: 12px;
+
+  // Showing 1 to 2 of 2 entries (filtered from 10 total entries)
+  div.dataTables_info {
+    display: inline-block;
+    padding: 5px 0px 6px 6px;
+  }
+
+  // with 25 per page
+  div.dataTables_length {
+    display: inline-block;
+
+    // Apply custom style to the inline x per page select
+    span.select2-container {
+      margin: 0px -3px 3px -3px;
+      max-width: 45px;
+
+      .select2-selection { border: none; }
+      .select2-selection__rendered { padding: 0px; color: #909090; }
+    }
+
+    span.select2-container.select2-container--open { max-width: 60px; }
+    span.select2-container.select2-container--focus { border: none; box-shadow: none; }
+    span.select2-container--focus > .selection > .select2-selection { border: none !important; }
+  }
 }
 
 // Buttons
@@ -139,13 +167,6 @@ ul.dt-button-collection {
   }
 }
 
-// Showing 1 to 25 of 100 entries
-div.dataTables_wrapper div.dataTables_info {
-  color: #909090;
-  font-size: 12px;
-  padding: 5px 0px 6px 6px;
-}
-
 // Collapsed Responsive View
 table.dataTable > tbody > tr.child {
   span.dtr-title { min-width: 175px; margin-bottom: 4px; }

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

@@ -11,7 +11,7 @@ module Effective
         end
 
         def length(length)
-          raise 'length must be 10, 25, 50, 100, 250, 1000, :all' unless [10, 25, 50, 100, 250, 1000, :all].include?(length)
+          raise 'length must be 10, 25, 50, 100, 250, 500, :all' unless [10, 25, 50, 100, 250, 500, :all].include?(length)
           datatable.state[:length] ||= (length == :all ? 9999999 : length)
         end
 

data/config/effective_datatables.rb

@@ -21,7 +21,7 @@ EffectiveDatatables.setup do |config|
   config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) } # CanCanCan
 
   # Default number of entries shown per page
-  # Valid options are: 5, 10, 25, 50, 100, 250, 1000, :all
+  # Valid options are: 5, 10, 25, 50, 100, 250, 500, :all
   config.default_length = 25
 
   # Default class used on the <table> tag

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '3.3.0'.freeze
+  VERSION = '3.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Code and Effect