simple_datatables 0.1.3 → 0.1.4

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.
Files changed (3) hide show
  1. data/lib/simple_datatables/version.rb +1 -1
  2. data/vendor/assets/javascripts/simple_datatables.js.coffee +15 -5
  3. metadata +9 -9
data/lib/simple_datatables/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SimpleDatatables
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
data/vendor/assets/javascripts/simple_datatables.js.coffee CHANGED
@@ -7,16 +7,15 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
7
7
 
8
8
  columns = [];
9
9
  searchcolumns = [];
10
+ sortcolumns = [];
10
11
 
11
12
  sEcho = 1;
12
13
  sSearch = "";
13
14
  bRegex = false;
14
15
  iDisplayStart = 0;
15
16
  iDisplayLength = 0;
16
- iSortCol = 0;
17
- sSortDir = "asc";
18
17
  data = [];
19
-
18
+
20
19
  $.each(aoData, (index, dataObj) ->
21
20
  switch dataObj.name
22
21
  when "sColumns"
@@ -32,11 +31,14 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
32
31
  when "iDisplayLength"
33
32
  iDisplayLength = dataObj.value;
34
33
  when "iSortCol_0"
34
+ console.log("yobanarot!");
35
35
  iSortCol = dataObj.value;
36
36
  when "sSortDir_0"
37
37
  sSortDir = dataObj.value;
38
+ else
39
+ console.log(dataObj.name);
38
40
  );
39
-
41
+
40
42
  $.each(aoData, (index, dataObj) ->
41
43
  search_regexp = ///sSearch_([0-9]+)///
42
44
  if (col = dataObj.name.match(search_regexp)) and dataObj.value
@@ -46,12 +48,20 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
46
48
  if (col = dataObj.name.match(search_regexp)) and dataObj.value
47
49
  searchcolumns.push(columns[col[1]]);
48
50
 
51
+ search_regexp = ///iSortCol_([0-9]+)///
52
+ if (col = dataObj.name.match(search_regexp))
53
+ sortcolumns[parseInt(col[1])]=columns[parseInt(dataObj.value)];
54
+
55
+ search_regexp = ///sSortDir_([0-9]+)///
56
+ if (col = dataObj.name.match(search_regexp)) and dataObj.value
57
+ sortcolumns[col[1]]=sortcolumns[col[1]]+"."+dataObj.value;
58
+
49
59
  );
50
60
 
51
61
  data.push({name: "sEcho", value: sEcho});
52
62
  data.push({name: "page", value: iDisplayStart/iDisplayLength + 1});
53
63
  data.push({name: "per_page", value: iDisplayLength});
54
- data.push({name: "search[meta_sort]", value: columns[iSortCol]+"."+sSortDir});
64
+ data.push({name: "search[meta_sort]", value: sortcolumns[0]});
55
65
 
56
66
  $.each(columns, (index, val) ->
57
67
  data.push({name: "columns["+index+"]", value: val});
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simple_datatables
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-08-29 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &27491640 !ruby/object:Gem::Requirement
16
+ requirement: &32162016 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.0.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *27491640
24
+ version_requirements: *32162016
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: will_paginate
27
- requirement: &27491268 !ruby/object:Gem::Requirement
27
+ requirement: &32161716 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 3.0.pre2
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *27491268
35
+ version_requirements: *32161716
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: meta_search
38
- requirement: &27489936 !ruby/object:Gem::Requirement
38
+ requirement: &32161488 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *27489936
46
+ version_requirements: *32161488
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: jsonify-rails
49
- requirement: &27489660 !ruby/object:Gem::Requirement
49
+ requirement: &32161212 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *27489660
57
+ version_requirements: *32161212
58
58
  description: Simple datatables to rails mapping using meta_search, will_paginage and
59
59
  jsonify
60
60
  email: