grid_table 1.1.2 → 1.2.rails3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c44e1fdf876a4c4746bc1059e673bb336282c45d
-  data.tar.gz: 6bd4005da4f6041f2328d1203f5f70dc780c37f8
+  metadata.gz: 987eee7ca033dbbfb6579b83fb97f912e7db2794
+  data.tar.gz: 0d39d86b97c8218c1256aff1b2306e4588d46ae4
 SHA512:
-  metadata.gz: cb99817deec411c95bd683b64bdad2228303c422f26158864ad6b147460aaab7d54c3b3176ad6814f6c556f0b29cbe6baeffa1e7d276a500cc28aa3558cba1fa
-  data.tar.gz: c19441237d6b73b8783341a38f68b406476068cdbd4839e18524dc1ea267e8e04744cf10153c429b1ad7fc6aaa92bf779dc0e4a38f650eefa15e2f76d22814b4
+  metadata.gz: a97b0d0644b943b15c0e3aeac6266a388cb3b23218ca21de0114df6726a8acdab0f904c007a18395cf043dcf148855caccc47313e44d7898a9a8d8c72c648f0f
+  data.tar.gz: f1e85c1594bbb665d4374c80fcae5bb3b529678726f48df4fad0026ba1cd83e5f2479c61dd132a0be5e88ad7d5c906c7095feaec2f635397ecc8ddb13925980c

data/lib/grid_table/control.rb

@@ -93,7 +93,7 @@ class GridTable::Control
       end
       records
     else
-      joined_control? ? records.includes(active_source).references(active_source) : records
+      joined_control? ? records.includes(active_source) : records
     end
   end
 

data/lib/grid_table/version.rb

@@ -1,3 +1,3 @@
 module GridTable
-  VERSION = "1.1.2"
+  VERSION = "1.2.rails3"
 end

data/vendor/assets/javascripts/gridtable.js

@@ -234,6 +234,9 @@ GridTable = (function() {
   };
 
   GridTable.prototype.loadData = function(params) {
+    if ($('li#pagedisplay').data('initial-page') != null) {
+      this.gridTableParams.page = $('li#pagedisplay').data('initial-page');
+    }
     if (params == null) {
       params = {};
     }
@@ -281,6 +284,11 @@ GridTable = (function() {
     });
   };
 
+  GridTable.prototype.clearInitialValues = function() {
+    $('li#pagedisplay').data('initial-page', null);
+    $('li#pagedisplay').data('initial-id', null);
+  }
+
   GridTable.prototype.exportData = function() {
     var baseUrl, url;
     url = this.gridTableParams.url.split('?');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grid_table
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.rails3
 platform: ruby
 authors:
 - Jon Principe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1