grid_table 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b27c4be55d74d0ccf12bd427010198b701bdca0
-  data.tar.gz: 8e36d295b387aabfde419f540831d6ffc9bcac17
+  metadata.gz: 77af68b6e6fae8251c5a11ed4ef26f59932f006c
+  data.tar.gz: 6c63b21f7e353036aa53e6e71b26d9e8fb8b305e
 SHA512:
-  metadata.gz: 4aeac716e13fd0351d22ef03e0513b38c93441ab804456f3d899ae0e2452fa564ad7202835d0b5bdb05cca0af2c1cf7dd534eb3cac747c286dbc346d969f2d0e
-  data.tar.gz: fbf43395823247b8ac48b06d44619ff8d952f284c19a8be0c3e570d14ebf8c1644f4547cf47a310ce2e4fcc5c2b7d986c7e42c301e668d36e812663ed6c3f27c
+  metadata.gz: c086aa624c594eb0d62a8fad8f0d848ad9f811871dde54b32b20ea3250a662936bd2ab2b792a1580ac3f02f7f4910b53dc9da0ed5f8457384917c1006ed669a7
+  data.tar.gz: 6c49ab52d943b133b3735be60d378c691dcf732c7f716cc3b997e77cf40226ce2b5a1d14c649a0bb049f0acb73d6d2a817f88b02479274d1df2d480103db890f

data/lib/grid_table/version.rb

@@ -1,3 +1,3 @@
 module GridTable
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

data/vendor/assets/javascripts/gridtable.js

@@ -22,7 +22,7 @@ $(function() {
           }
           return gridtable.setUrl(url);
         } else {
-          return gridtable.setUrl(updateQueryString(n, _this.value, url));
+          return gridtable.setUrl(gridtable.updateQueryString(n, _this.value, url));
         }
       };
     })(this));
@@ -62,6 +62,7 @@ window.GridTableFactory = (function() {
       gridTable = GridTableFactory.get($table);
       return gridTable.refresh();
     });
+
     this.gridTableList[$table.data('grid-table-id') || this.defaultGridTableId] = gridTable;
     return gridTable;
   };
@@ -365,12 +366,12 @@ GridTable = (function() {
     return display.text("" + (this.gridTableParams.page + 1) + " of " + (last_page + 1) + " (" + total_rows + ")");
   };
 
-  GridTable.prototype.updateSortDisplay = function() {
+  GridTable.prototype.updateSortDisplay = function () {
     var field, sortOrder;
     field = this.gridTableParams.sortCol;
     sortOrder = this.gridTableParams.sortOrder;
-    return this.gridTableDOM.find('thead th[data-sort="true"], .thead [data-sort="true"]').each((function(_this) {
-      return function(i, c) {
+    return this.gridTableDOM.find('thead th[data-sort="true"], .thead [data-sort="true"]').each((function (_this) {
+      return function (i, c) {
         var value;
         value = $(c).data('field');
         if (value === field) {
@@ -393,6 +394,35 @@ GridTable = (function() {
     })(this));
   };
 
+  GridTable.prototype.updateQueryString = function (key, value, url) {
+    var hash, re, separator;
+    if (!url) {
+      url = window.location.href;
+    }
+    re = new RegExp("([?&])" + key + "=.*?(&|#|$)(.*)", "gi");
+    if (re.test(url)) {
+      if (typeof value !== "undefined" && value !== null) {
+        url = url.replace(re, "$1" + key + "=" + value + "$2$3");
+      } else {
+        hash = url.split("#");
+        url = hash[0].replace(re, "$1$3").replace(/(&|\?)$/, "");
+        if (typeof hash[1] !== "undefined" && hash[1] !== null) {
+          url += "#" + hash[1];
+        }
+      }
+    } else {
+      if (typeof value !== "undefined" && value !== null) {
+        separator = (url.indexOf("?") !== -1 ? "&" : "?");
+        hash = url.split("#");
+        url = hash[0] + separator + key + "=" + value;
+        if (typeof hash[1] !== "undefined" && hash[1] !== null) {
+          url += "#" + hash[1];
+        }
+      }
+    }
+    return url;
+  };
+
   GridTableParams = (function() {
     GridTableParams.prototype.id = null;
     GridTableParams.prototype.url = null;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_table
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jon Principe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Utility for powerful HTML Tables