grid_table 1.1.2 → 1.2.rails3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c44e1fdf876a4c4746bc1059e673bb336282c45d
4
- data.tar.gz: 6bd4005da4f6041f2328d1203f5f70dc780c37f8
3
+ metadata.gz: 987eee7ca033dbbfb6579b83fb97f912e7db2794
4
+ data.tar.gz: 0d39d86b97c8218c1256aff1b2306e4588d46ae4
5
5
  SHA512:
6
- metadata.gz: cb99817deec411c95bd683b64bdad2228303c422f26158864ad6b147460aaab7d54c3b3176ad6814f6c556f0b29cbe6baeffa1e7d276a500cc28aa3558cba1fa
7
- data.tar.gz: c19441237d6b73b8783341a38f68b406476068cdbd4839e18524dc1ea267e8e04744cf10153c429b1ad7fc6aaa92bf779dc0e4a38f650eefa15e2f76d22814b4
6
+ metadata.gz: a97b0d0644b943b15c0e3aeac6266a388cb3b23218ca21de0114df6726a8acdab0f904c007a18395cf043dcf148855caccc47313e44d7898a9a8d8c72c648f0f
7
+ data.tar.gz: f1e85c1594bbb665d4374c80fcae5bb3b529678726f48df4fad0026ba1cd83e5f2479c61dd132a0be5e88ad7d5c906c7095feaec2f635397ecc8ddb13925980c
@@ -93,7 +93,7 @@ class GridTable::Control
93
93
  end
94
94
  records
95
95
  else
96
- joined_control? ? records.includes(active_source).references(active_source) : records
96
+ joined_control? ? records.includes(active_source) : records
97
97
  end
98
98
  end
99
99
 
@@ -1,3 +1,3 @@
1
1
  module GridTable
2
- VERSION = "1.1.2"
2
+ VERSION = "1.2.rails3"
3
3
  end
@@ -234,6 +234,9 @@ GridTable = (function() {
234
234
  };
235
235
 
236
236
  GridTable.prototype.loadData = function(params) {
237
+ if ($('li#pagedisplay').data('initial-page') != null) {
238
+ this.gridTableParams.page = $('li#pagedisplay').data('initial-page');
239
+ }
237
240
  if (params == null) {
238
241
  params = {};
239
242
  }
@@ -281,6 +284,11 @@ GridTable = (function() {
281
284
  });
282
285
  };
283
286
 
287
+ GridTable.prototype.clearInitialValues = function() {
288
+ $('li#pagedisplay').data('initial-page', null);
289
+ $('li#pagedisplay').data('initial-id', null);
290
+ }
291
+
284
292
  GridTable.prototype.exportData = function() {
285
293
  var baseUrl, url;
286
294
  url = this.gridTableParams.url.split('?');
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grid_table
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.2.rails3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jon Principe
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-04-04 00:00:00.000000000 Z
12
+ date: 2016-04-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -75,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
75
75
  version: '0'
76
76
  required_rubygems_version: !ruby/object:Gem::Requirement
77
77
  requirements:
78
- - - '>='
78
+ - - '>'
79
79
  - !ruby/object:Gem::Version
80
- version: '0'
80
+ version: 1.3.1
81
81
  requirements: []
82
82
  rubyforge_project:
83
83
  rubygems_version: 2.0.14.1