effective_datatables 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0acd4cd2050351cb28f291512e5c406274910f86
-  data.tar.gz: 1626a6ee151bc7f3bb2199fe4ab3eb5522e0f185
+  metadata.gz: 645afb224b6e4c126e123cf1b0fe2279560b76d0
+  data.tar.gz: 125289441e6b5d29b684d11135d41b2e16e5bfd2
 SHA512:
-  metadata.gz: e09f581a96725bd78dde69829e7525b074d6cd5d46c868d9a3788c7db24da052305f127d6aeefb9d776c03669809a1c07c5e2d38e80bebfba264767140959ed4
-  data.tar.gz: c4a59dcc40bafe443462b4ab03d0db77d4ef7e2da267b579150d7259e2cac32930ff6a4d4d0c14f460c6217dc6a2f39615fceefe033fd6303df649fbb6466389
+  metadata.gz: ee412c7efaa5d9c0dce32002bccae79dcdaa3990ef6cd2573abd37ba2623aa73a1d0158b3083e39190969e516994c08a7c074cf8daf1f2afc54b75e952733263
+  data.tar.gz: e389de935982957b7e40b1deb64d59417561c24d905b3f25bbfb06c3362f91b4a86e89fc87dc769594d3a70054399137536892425ffae8c18f6b3d7d2068a82c

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

@@ -13,7 +13,7 @@ initializeDataTables = ->
         bProcessing: true
         bSaveState: true
         bAutoWidth: false
-        deferLoading: datatable.data('total-entries')
+        deferLoading: [datatable.data('display-records'), datatable.data('total-records')]
         deferRender: true
         order: datatable.data('default-order')
         sAjaxSource: datatable.data('source')

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

@@ -1,4 +1,4 @@
-%table.effective-datatable{:id => "#{datatable.to_param}-table", :class => ('table ' + table_class.to_s), :data => {'effective-datatables-table' => style, 'source' => effective_datatables.datatable_path(datatable, {:format => 'json'}.merge(:attributes => datatable.attributes)), 'filter' => datatable_filter(datatable, filterable), 'non-sortable' => datatable_non_sortable(datatable, sortable), 'non-visible' => datatable_non_visible(datatable), 'widths' => datatable_widths(datatable), 'default-order' => datatable_default_order(datatable), 'default-entries' => datatable.default_entries, 'total-entries' => (datatable.to_json[:iTotalRecords] || false), 'column-classes' => datatable_column_classes(datatable)}}
+%table.effective-datatable{:id => "#{datatable.to_param}-table", :class => ('table ' + table_class.to_s), :data => {'effective-datatables-table' => style, 'source' => effective_datatables.datatable_path(datatable, {:format => 'json'}.merge(:attributes => datatable.attributes)), 'filter' => datatable_filter(datatable, filterable), 'non-sortable' => datatable_non_sortable(datatable, sortable), 'non-visible' => datatable_non_visible(datatable), 'widths' => datatable_widths(datatable), 'default-order' => datatable_default_order(datatable), 'default-entries' => datatable.default_entries, 'display-records' => (datatable.to_json[:iTotalDisplayRecords] || 0), 'total-records' => (datatable.to_json[:iTotalRecords] || 0), 'column-classes' => datatable_column_classes(datatable)}}
   %thead
     - max_depth = datatable.table_columns.map { |_, opts| opts[:th][:depth].to_i rescue 0 }.max
     - [*0..max_depth].each do |depth|

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails