Skip to content
Browse files

Merge branch 'release/2.0.0-alpha3'

  • Loading branch information...
2 parents 4025609 + 5c00e1d commit 39c90c237816eee44dd2d6e64ceccf528ccf98cb @amalloy amalloy committed Aug 19, 2012
View
2 project.clj
@@ -1,4 +1,4 @@
-(defproject foreclojure "2.0.0-alpha2"
+(defproject foreclojure "2.0.0-alpha3"
:description "4clojure - a website for learning Clojure"
:dependencies [[org.clojure/clojure "1.4.0"]
[compojure "1.1.0"]
View
2 resources/public/script/foreclojure.js
@@ -172,7 +172,7 @@ function configureDataTables(){
"bProcessing": true,
"bServerSide": true,
"sAjaxSource": "/datatable/users"
- } );
+ } ).fnSetFilteringDelay(300);
}
function setIconColor(element, color, timeOut, stopAnimation) {
View
34 resources/public/vendor/script/jquery.dataTables.fnSetFilteringDelay.js
@@ -0,0 +1,34 @@
+// Source http://datatables.net/plug-ins/api
+
+jQuery.fn.dataTableExt.oApi.fnSetFilteringDelay = function ( oSettings, iDelay ) {
+ var _that = this;
+
+ if ( iDelay === undefined ) {
+ iDelay = 250;
+ }
+
+ this.each( function ( i ) {
+ $.fn.dataTableExt.iApiIndex = i;
+ var
+ $this = this,
+ oTimerId = null,
+ sPreviousSearch = null,
+ anControl = $( 'input', _that.fnSettings().aanFeatures.f );
+
+ anControl.unbind( 'keyup' ).bind( 'keyup', function() {
+ var $$this = $this;
+
+ if (sPreviousSearch === null || sPreviousSearch != anControl.val()) {
+ window.clearTimeout(oTimerId);
+ sPreviousSearch = anControl.val();
+ oTimerId = window.setTimeout(function() {
+ $.fn.dataTableExt.iApiIndex = i;
+ _that.fnFilter( anControl.val() );
+ }, iDelay);
+ }
+ });
+
+ return this;
+ } );
+ return this;
+};
View
4 src/foreclojure/problems.clj
@@ -14,7 +14,11 @@
[foreclojure.users :only [golfer? get-user-id disable-codebox?]]
[foreclojure.solutions :only [save-solution get-solution]]
[clojail.core :exclude [safe-read]]
+<<<<<<< HEAD
+ [clojail.testers :only [secure-tester blanket blacklist-symbols]]
+=======
[clojail.testers :only [secure-tester]]
+>>>>>>> 8a9f2
[somnium.congomongo :only [update! fetch-one fetch fetch-and-modify destroy!]]
[hiccup.form :only [form-to text-area hidden-field label text-field drop-down]]
[hiccup.element :only [link-to]]
View
2 src/foreclojure/template.clj
@@ -22,7 +22,7 @@
[:style {:type "text/css"}
".syntaxhighlighter { overflow-y: hidden !important; }"]
(css "css/style.css" "css/demo_table.css" "css/shCore.css" "css/shThemeDefault.css")
- (js "vendor/script/jquery-1.5.2.min.js" "vendor/script/jquery.dataTables.min.js" "vendor/script/jquery.flipCounter.1.1.pack.js" "vendor/script/jquery.easing.1.3.js")
+ (js "vendor/script/jquery-1.5.2.min.js" "vendor/script/jquery.dataTables.min.js" "vendor/script/jquery.flipCounter.1.1.pack.js" "vendor/script/jquery.easing.1.3.js" "vendor/script/jquery.dataTables.fnSetFilteringDelay.js")
(js "script/codebox.js" "script/foreclojure.js")
(js "vendor/script/xregexp.js" "vendor/script/shCore.js" "vendor/script/shBrushClojure.js")
(js "vendor/script/ace/ace.js" "vendor/script/ace/mode-clojure.js")

0 comments on commit 39c90c2

Please sign in to comment.
Something went wrong with that request. Please try again.