Merge branch 'release/1.3.3'

darrenaustin · Sep 25, 2011 · 5383458 · 5383458
2 parents 08aa61f + 649c55d
commit 5383458
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject foreclojure "1.3.2"
+(defproject foreclojure "1.3.3"
   :description "4clojure - a website for lisp beginners"
   :dependencies [[clojure "1.2.1"]
                  [clojure-contrib "1.2.0"]

diff --git a/resources/public/script/foreclojure.js b/resources/public/script/foreclojure.js
@@ -24,15 +24,29 @@ $(document).ready(function() {
 
 });
 
+var difficulty = new Array();
+difficulty["Elementary"] = 0;
+difficulty["Easy"]       = 1;
+difficulty["Medium"]     = 2;
+difficulty["Hard"]       = 3;
+difficulty[""]           = 4;
+
+jQuery.fn.dataTableExt.oSort['difficulty-asc'] = function(a, b) {
+    return difficulty[a] - difficulty[b];
+};
+
+jQuery.fn.dataTableExt.oSort['difficulty-desc'] = function(a, b) {
+    return difficulty[b] - difficulty[a];
+};
 
 function configureDataTables(){
 
     $('#problem-table').dataTable( {
         "iDisplayLength": 25,
-        "aaSorting": [[ 4, "desc" ]],
+        "aaSorting": [[5, "desc"], [ 1, "asc" ], [ 4, "desc" ]],
         "aoColumns": [
             null,
-            null,
+            { "sType": "difficulty" },
             null,
             null,
             null,