simple_datatables 0.1.3 → 0.1.4

data/lib/simple_datatables/version.rb

@@ -1,3 +1,3 @@
 module SimpleDatatables
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/vendor/assets/javascripts/simple_datatables.js.coffee

@@ -7,16 +7,15 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
       
   columns = [];
   searchcolumns = [];
+  sortcolumns = [];
   
   sEcho = 1;
   sSearch = "";
   bRegex = false;
   iDisplayStart = 0;
   iDisplayLength = 0;
-  iSortCol = 0;
-  sSortDir = "asc";
   data = [];
-      
+
   $.each(aoData, (index, dataObj) -> 
     switch dataObj.name
       when "sColumns"
@@ -32,11 +31,14 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
       when "iDisplayLength"
         iDisplayLength = dataObj.value;
       when "iSortCol_0"
+        console.log("yobanarot!");
         iSortCol = dataObj.value;
       when "sSortDir_0"
         sSortDir = dataObj.value;
+      else
+        console.log(dataObj.name);
   );
-      
+
   $.each(aoData, (index, dataObj) -> 
     search_regexp = ///sSearch_([0-9]+)///
     if (col = dataObj.name.match(search_regexp)) and dataObj.value
@@ -46,12 +48,20 @@ root.simpleDatatables = ( sSource, aoData, fnCallback ) ->
     if (col = dataObj.name.match(search_regexp)) and dataObj.value
       searchcolumns.push(columns[col[1]]);
 
+    search_regexp = ///iSortCol_([0-9]+)///
+    if (col = dataObj.name.match(search_regexp))
+      sortcolumns[parseInt(col[1])]=columns[parseInt(dataObj.value)];
+
+    search_regexp = ///sSortDir_([0-9]+)///
+    if (col = dataObj.name.match(search_regexp)) and dataObj.value
+      sortcolumns[col[1]]=sortcolumns[col[1]]+"."+dataObj.value;
+
   );
 
   data.push({name: "sEcho", value: sEcho});
   data.push({name: "page", value: iDisplayStart/iDisplayLength + 1});
   data.push({name: "per_page", value: iDisplayLength});
-  data.push({name: "search[meta_sort]", value: columns[iSortCol]+"."+sSortDir});
+  data.push({name: "search[meta_sort]", value: sortcolumns[0]});
 
   $.each(columns, (index, val) -> 
     data.push({name: "columns["+index+"]", value: val});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &27491640 !ruby/object:Gem::Requirement
+  requirement: &32162016 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *27491640
+  version_requirements: *32162016
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &27491268 !ruby/object:Gem::Requirement
+  requirement: &32161716 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.pre2
   type: :runtime
   prerelease: false
-  version_requirements: *27491268
+  version_requirements: *32161716
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &27489936 !ruby/object:Gem::Requirement
+  requirement: &32161488 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27489936
+  version_requirements: *32161488
 - !ruby/object:Gem::Dependency
   name: jsonify-rails
-  requirement: &27489660 !ruby/object:Gem::Requirement
+  requirement: &32161212 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27489660
+  version_requirements: *32161212
 description: Simple datatables to rails mapping using meta_search, will_paginage and
   jsonify
 email: