Changeset 5794

Timestamp:

07/25/08 08:05:17 (1 month ago)

Author:

christian.bach

Message:

Added new changes to the sort algos.

Files:

• trunk/plugins/tablesorter/2.0/jquery.tablesorter.js (modified) (5 diffs)

trunk/plugins/tablesorter/2.0/jquery.tablesorter.js

@@ -22 +22 @@
  * @desc Create a tablesorter interface and sort on the first and secound column in ascending order.
  * 
- * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } });
+ * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } } });
  * @desc Create a tablesorter interface and disableing the first and secound column headers.
  * 
@@ -443 +443 @@
                     var order = sortList[i][1];
                     //var s = (getCachedSortType(table.config.parsers,c) == "text") ? ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ? "sortNumeric" : "sortNumericDesc");
-                    var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ? makeSortNumeric(c) : makeSortNumericDesc(c));
+                    //var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ? makeSortNumeric(c) : makeSortNumericDesc(c));
+                    var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c));
                     var e = "e" + i;
                     
@@ -464 +465 @@
                 
                 if(table.config.debug) { benchmark("Evaling expression:" + dynamicExp, new Date()); }
-                
+
                 eval(dynamicExp);
                 
@@ -472 +473 @@
                 
                 return cache;
+            };
+            
+            function makeSortFunction(type, direction, index) {
+                var a = "a[" + index + "]", b = "b[" + index + "]";
+                if (type == 'text' && direction == 'asc') {
+                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
+                } else if (type == 'text' && direction == 'desc') {
+                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
+                } else if (type == 'numeric' && direction == 'asc') {
+                    return  "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));";
+                } else if (type == 'numeric' && direction == 'desc') {
+                    return  "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));";
+                }   
             };
             
@@ -756 +770 @@
         id: "currency",
         is: function(s) {
-            return /^[£$€?.]/.test(s);
+            return /^[£$€?.]/.test(s);
         },
         format: function(s) {