effective_datatables 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d85c8ad7664954cac2285e04ffc503a5c6385e
-  data.tar.gz: 5fd451f1b6a10e08de8fc6820721d21b4279f19c
+  metadata.gz: 974ccbf528f6947d0eca568ad9af53bb29ee0eca
+  data.tar.gz: 8f3836e0bf9b4b9fc36ee79acd361e47c7c5faae
 SHA512:
-  metadata.gz: ad105c7e0855fe642b4f74e0cd89860762e629713f119d614398acff973d509f4b19904770c8ed95fc7227641d7d74f99d5ff14380d20611d9e1902159119bd3
-  data.tar.gz: a735ea5474c5e3b04b0f63df4976259fd8907e589e08bfa6084f26726ac1f58ca1b40840f69b3508dfc5457d3544b8b1326cc2dd996ed5c69fdfea5074c04c7e
+  metadata.gz: 82c049842341821b4df913db9c7be555b36aee6070c4629df352ae33bdc7b61913bdc5a60a10344697ca2cd2a7b170077830b0e8c0c56ba505abc31c19ccc925
+  data.tar.gz: fa9f8b1485760f5e0ad04be8b9f4d0e08470abc476582452030ebcd6796d6bb7d5c9476ef790359c6ee62a70949b26bea6f76af3edd832cdedd08c06e0d90f76

data/app/assets/javascripts/effective_datatables.bootstrap2.js

@@ -7,5 +7,5 @@
 //= require_tree ./effective_datatables
 
 $.extend( $.fn.dataTable.defaults, {
-  'dom': "<'row'<'span4'l><'span4'T><'span4'f>r>t<'row'<'span6'i><'span6'p>>"
+  'dom': "<'row'<'span6'l><'span6'TC>r>t<'row'<'span6'i><'span6'p>>"
 });

data/app/assets/javascripts/effective_datatables.js

@@ -7,6 +7,6 @@
 //= require_tree ./effective_datatables
 
 $.extend( $.fn.dataTable.defaults, {
-  'dom': "<'row'<'col-xs-4'l><'col-xs-4'T><'col-xs-4'fC>r>t<'row'<'col-xs-6'i><'col-xs-6'p>>"
+  'dom': "<'row'<'col-xs-6'l><'col-xs-6'TC>r>t<'row'<'col-xs-6'i><'col-xs-6'p>>"
 });
 

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

@@ -21,16 +21,27 @@ initializeDataTables = ->
         iDisplayLength: 25
         fnServerParams: (aoData, a, b) ->
           table = this.DataTable()
-          table.columns().flatten().each (index) ->
+          table.columns().flatten().each (index) ->  # Pass which columns are visible back to server
             aoData.push({'name': "sVisible_#{index}", 'value': table.column(index).visible()})
+
+          # If this is the very first request to the server we have to manually set any selected filter options here
+          # So that we can skip an fnFilter call in the dataTables.columnFilter that results in a double AJAX call
+          ((sEcho = data; break) if data.name == 'sEcho') for data in aoData
+          if sEcho && sEcho.value == 1
+            $.each (datatable.data('filter') || []), (index, filter) ->
+              if(filter.selected)
+                sSearch = undefined
+                ((sSearch = data; break) if data.name == "sSearch_#{index}") for data in aoData
+                sSearch.value = filter.selected if sSearch
+
         aoColumnDefs: aoColumnDefs
         aoColumns: datatable.data('widths')
         oTableTools:
           sSwfPath: '/assets/effective_datatables/copy_csv_xls_pdf.swf',
-          aButtons: ['copy', 'csv', 'pdf', 'print']
+          aButtons: ['csv', {'sExtends': 'xls', 'sButtonText': 'Excel'}, 'print']
         colVis:
           showAll: 'Show all'
-          restore: 'Restore default visible'
+          restore: 'Show default'
           activate: 'mouseover'
           fnStateChange: (iCol, bVisible) ->
             table = $(this.dom.button).closest('.dataTables_wrapper').children('table').first().DataTable()
@@ -44,7 +55,9 @@ initializeDataTables = ->
         init_options['dom'] = "<'row'r>t" # Just show the table
 
       # Actually initialize it
+      console.log('blah')
       datatable = datatable.dataTable(init_options)
+      console.log('initted')
 
       if filter
         datatable.columnFilter
@@ -52,10 +65,5 @@ initializeDataTables = ->
           aoColumns : datatable.data('filter')
           bUseColVis: true
 
-  $('.dataTables_filter').each ->
-    $(this).html("<button class='btn-reset-filters ColVis_Button' data-effective-datatables-reset-filters='true'><span>Reset Filters</span></button>")
-
 $ -> initializeDataTables()
 $(document).on 'page:change', -> initializeDataTables()
-
-$(document).on 'click', '[data-effective-datatables-reset-filters]', (event) -> window.location.reload()

data/app/assets/javascripts/vendor/jquery.dataTables.columnFilter.js

@@ -404,8 +404,11 @@
                                                 oTable.fnFilter(unescape($(this).val()), iColumn); //Issue 25
                                         fnOnFiltered();
                                 });
-                                if (currentFilter != null && currentFilter != "")//Issue 81
-                                        oTable.fnFilter(unescape(currentFilter), iColumn);
+                                // Commented out by Matt.
+                                // Removing this and hackign the fnServerParams for the first request
+                                // Prevents a double AJAX call
+                                // if (currentFilter != null && currentFilter != "")//Issue 81
+                                //         oTable.fnFilter(unescape(currentFilter), iColumn);
                         }
         }
 

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

@@ -110,9 +110,8 @@
   }
 
   .DTTT_container {
-    float: none;
-    width: 190px;
-    margin: auto;
+    float: right;
+    margin-right: -3px;
   }
 }
 

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.3'.freeze
 end

metadata

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