grid_table 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb5341d0c50f6878b55cce0a85e5f2cde174f184
-  data.tar.gz: b500976a3684460ecb3f12d1e345b797d6077a6e
+  metadata.gz: e49713f15732a6342839fbb76a455fc844e9e8b0
+  data.tar.gz: fb0ccace4cecad020a666978a828a952408b2944
 SHA512:
-  metadata.gz: 8e3c408bafe26b976eab971dcce36e7964a70668ebae8feb529de9f77c2dfc018fff96a98c3e14ea5d5af4c561fd27301f02f2bd87757773074428932dc2b23f
-  data.tar.gz: 1115b8b02d21a6d3bff6fcbbe0fdbac16b2283141cc101ce5acd65d131fb1f91b8e1ad7f2ad8011c2e700299310e4dd7a4b8ba720e2c0b97b2bd664399f18278
+  metadata.gz: 843e4b5ab3055808b4106844e433215ff924c3fcf4ea9422306cf773625913955a26e58d99704c3a7a3aaf4cfc7b46f9b32b973e5d618cd581b412518ebc039f
+  data.tar.gz: 984165e174c880a8f70d78ede133933d0cc88e9f935886d0860e927b73ed2fda67396f5e2496d6af7567f08be32fad041cad77d14eee46cb3648f82e61331a27

data/lib/grid_table/version.rb

@@ -1,3 +1,3 @@
 module GridTable
-  VERSION = '1.6.3'.freeze
+  VERSION = '1.6.4'.freeze
 end

data/vendor/assets/javascripts/gridtable.js

@@ -123,10 +123,12 @@ GridTable = (function() {
         });
       };
     })(this));
+
     var dataFilterSelector = "[data-filter]";
+
     $("select" + dataFilterSelector).each((function (_this) {
       return function (index, filter) {
-        if ($(filter).data('grid-table-id').split(',').includes(_this.gridTableParams.getId())) {
+        if (_this.gridTableParams.includeFilter(filter)) {
           _this.gridTableParams.setFilter($(filter).data('field'), $(filter).val());
           return $(filter).on("change", function (event) {
             _this.gridTableParams.setFilter($(filter).data('field'), $(filter).val());
@@ -139,7 +141,7 @@ GridTable = (function() {
     // find non-selectable inputs
     $("input:not([type=radio], [type=checkbox])" + dataFilterSelector).each((function (_this) {
       return function (index, filter) {
-        if ($(filter).data('grid-table-id').split(',').includes(_this.gridTableParams.getId())) {
+        if (_this.gridTableParams.includeFilter(filter)) {
           var timeout;
           timeout = null;
           return $(filter).on("propertychange keyup input paste", function (event) {
@@ -155,19 +157,21 @@ GridTable = (function() {
 
     $("input:radio" + dataFilterSelector + ",input:checkbox" + dataFilterSelector).each((function (_this) {
       return function(index, filter) {
-        var timeout;
-        // only setFilter for radio && checkbox inputs if they are also checked
-        if (filter.checked) {
-          _this.gridTableParams.setFilter($(filter).data('field'), $(filter).val());
-        }
-        timeout = null;
-        return $(filter).on("change", function(event) {
-          clearTimeout(timeout);
-          return timeout = setTimeout((function() {
+        if (_this.gridTableParams.includeFilter(filter)) {
+          var timeout;
+          // only setFilter for radio && checkbox inputs if they are also checked
+          if (filter.checked) {
             _this.gridTableParams.setFilter($(filter).data('field'), $(filter).val());
-            return _this.loadData();
-          }), 500);
-        });
+          }
+          timeout = null;
+          return $(filter).on("change", function(event) {
+            clearTimeout(timeout);
+            return timeout = setTimeout((function() {
+              _this.gridTableParams.setFilter($(filter).data('field'), $(filter).val());
+              return _this.loadData();
+            }), 500);
+          });
+        }
       };
     })(this));
 
@@ -554,6 +558,12 @@ GridTable = (function() {
       }
     };
 
+    GridTableParams.prototype.includeFilter = function (filter) {
+      var gridTableIds = $(filter).data('grid-table-id');
+
+      return $.inArray(this.id, gridTableIds.split(','));
+    }
+
     GridTableParams.prototype.buildUrl = function(baseUrl, skip_paging) {
       var k, url, v, _ref;
       if (skip_paging == null) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_table
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Jon Principe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler