From 2974c81672cbc1179f0eea085379ab14bc206216 Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 29 Nov 2011 08:08:00 -0600 Subject: [PATCH 01/44] Use jQuery's 'trim' function so that things work on IE 8. Fixes #20. --- resources/public/javascript/tryclojure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index dec3762..4e04303 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -125,7 +125,7 @@ function onValidate(input) { } function onHandle(line, report) { - var input = line.trim(); + var input = $.trim(line); // handle commands if (doCommand(input, report)) return; From bc0a0b870aa6cc8eecb92adf640335625abca8aa Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 29 Nov 2011 08:37:09 -0600 Subject: [PATCH 02/44] Move to a more traditional web app layout. --- project.clj | 2 +- src/tryclojure/models/eval.clj | 41 +++++++++++ src/tryclojure/server.clj | 18 +++++ src/tryclojure/views/eval.clj | 16 +++++ src/tryclojure/{core.clj => views/home.clj} | 78 +-------------------- src/tryclojure/views/tutorial.clj | 5 ++ 6 files changed, 84 insertions(+), 76 deletions(-) create mode 100644 src/tryclojure/models/eval.clj create mode 100644 src/tryclojure/server.clj create mode 100644 src/tryclojure/views/eval.clj rename src/tryclojure/{core.clj => views/home.clj} (63%) create mode 100644 src/tryclojure/views/tutorial.clj diff --git a/project.clj b/project.clj index 2120500..c7974b4 100644 --- a/project.clj +++ b/project.clj @@ -8,6 +8,6 @@ ;; this line to .cake/config: jvm.opts = -Djava.security.policy=example.policy :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] :hooks [leiningen.fetch-js] - :main tryclojure.core) + :main tryclojure.server) diff --git a/src/tryclojure/models/eval.clj b/src/tryclojure/models/eval.clj new file mode 100644 index 0000000..da9b1f1 --- /dev/null +++ b/src/tryclojure/models/eval.clj @@ -0,0 +1,41 @@ +(ns tryclojure.models.eval + (:use [clojail.testers :only [secure-tester-without-def]] + [clojail.core :only [sandbox]] + [clojure.stacktrace :only [root-cause]]) + (:require [noir.session :as session]) + (:import java.io.StringWriter + java.util.concurrent.TimeoutException)) + +(defn eval-form [form sbox] + (with-open [out (StringWriter.)] + (let [result (sbox form {#'*out* out})] + {:expr form + :result [out result]}))) + +(defn eval-string [expr sbox] + (let [form (binding [*read-eval* false] (read-string expr))] + (eval-form form sbox))) + +(def try-clojure-tester + (into secure-tester-without-def + #{'tryclojure.core})) + +(defn make-sandbox [] + (sandbox try-clojure-tester + :timeout 2000 + :init '(do (use '[clojure.repl :only [doc]]) + (future (Thread/sleep 600000) + (-> *ns* .getName remove-ns))))) + +(defn find-sb [old] + (if-let [sb (get old "sb")] + old + (assoc old "sb" (make-sandbox)))) + +(defn eval-request [expr] + (try + (eval-string expr (get (session/swap! find-sb) "sb")) + (catch TimeoutException _ + {:error true :message "Execution Timed Out!"}) + (catch Exception e + {:error true :message (str (root-cause e))}))) \ No newline at end of file diff --git a/src/tryclojure/server.clj b/src/tryclojure/server.clj new file mode 100644 index 0000000..a606a15 --- /dev/null +++ b/src/tryclojure/server.clj @@ -0,0 +1,18 @@ +(ns tryclojure.server + (:use [ring.middleware.file :only [wrap-file]]) + (:require [noir.server :as server])) + +(server/add-middleware wrap-file (System/getProperty "user.dir")) +(server/load-views "src/tryclojure/views") + +(defn to-port [s] + (when-let [port s] (Long. port))) + +(defn tryclj [& [port]] + (server/start + (or (to-port port) + (to-port (System/getenv "PORT")) ;; For deploying to Heroku + 8801) + {:session-cookie-attrs {:max-age 600}})) + +(defn -main [& args] (tryclj (first args))) \ No newline at end of file diff --git a/src/tryclojure/views/eval.clj b/src/tryclojure/views/eval.clj new file mode 100644 index 0000000..782e40e --- /dev/null +++ b/src/tryclojure/views/eval.clj @@ -0,0 +1,16 @@ +(ns tryclojure.views.eval + (:use [noir.core :only [defpage]] + [noir.response :only [json]] + [tryclojure.models.eval :only [eval-request]])) + +(defpage "/eval.json" {:keys [expr jsonp]} + (update-in + (json + (let [{:keys [expr result error message] :as res} (eval-request expr)] + (if error + res + (let [[out res] result] + {:expr (pr-str expr) + :result (str out (pr-str res))})))) + [:body] + #(if jsonp (str jsonp "(" % ")") %))) \ No newline at end of file diff --git a/src/tryclojure/core.clj b/src/tryclojure/views/home.clj similarity index 63% rename from src/tryclojure/core.clj rename to src/tryclojure/views/home.clj index 4932813..db6f1a4 100644 --- a/src/tryclojure/core.clj +++ b/src/tryclojure/views/home.clj @@ -1,15 +1,6 @@ -(ns tryclojure.core - (:use [hiccup form-helpers page-helpers] - ring.middleware.file - noir.core - [noir.response :only [json]] - [clojure.stacktrace :only [root-cause]] - [clojail.core :only [sandbox eagerly-consume]] - [clojail.testers :only [secure-tester-without-def]]) - (:require [noir.server :as server] - [noir.session :as session]) - (:import java.io.StringWriter - java.util.concurrent.TimeoutException)) +(ns tryclojure.views.home + (:use [noir.core :only [defpartial defpage]] + [hiccup form-helpers page-helpers])) (defpartial links [] (unordered-list @@ -104,66 +95,3 @@ (defpage "/links" [] (links)) - -(defpage [:post "/tutorial"] {n :n} - (slurp (str "resources/public/tutorial/page" n ".html"))) - -(defn eval-form [form sbox] - (with-open [out (java.io.StringWriter.)] - (let [result (sbox form {#'*out* out})] - {:expr form - :result [out result]}))) - -(defn eval-string [expr sbox] - (let [form (binding [*read-eval* false] (read-string expr))] - (eval-form form sbox))) - -(def try-clojure-tester - (into secure-tester-without-def - #{'tryclojure.core})) - -(defn make-sandbox [] - (sandbox try-clojure-tester - :timeout 2000 - :init '(do (use '[clojure.repl :only [doc]]) - (future (Thread/sleep 600000) - (-> *ns* .getName remove-ns))))) - -(defn find-sb [old] - (if-let [sb (get old "sb")] - old - (assoc old "sb" (make-sandbox)))) - -(defn eval-request [expr] - (try - (eval-string expr (get (session/swap! find-sb) "sb")) - (catch TimeoutException _ - {:error true :message "Execution Timed Out!"}) - (catch Exception e - {:error true :message (str (root-cause e))}))) - -(defpage "/eval.json" {:keys [expr jsonp]} - (update-in - (json - (let [{:keys [expr result error message] :as res} (eval-request expr)] - (if error - res - (let [[out res] result] - {:expr (pr-str expr) - :result (str out (pr-str res))})))) - [:body] - #(if jsonp (str jsonp "(" % ")") %))) - -(server/add-middleware wrap-file (System/getProperty "user.dir")) - -(defn to-port [s] - (when-let [port s] (Long. port))) - -(defn tryclj [& [port]] - (server/start - (or (to-port port) - (to-port (System/getenv "PORT")) ;; For deploying to Heroku - 8801) - {:session-cookie-attrs {:max-age 600}})) - -(defn -main [& args] (tryclj (first args))) \ No newline at end of file diff --git a/src/tryclojure/views/tutorial.clj b/src/tryclojure/views/tutorial.clj new file mode 100644 index 0000000..69538ad --- /dev/null +++ b/src/tryclojure/views/tutorial.clj @@ -0,0 +1,5 @@ +(ns tryclojure.views.tutorial + (:use [noir.core :only [defpage]])) + +(defpage [:post "/tutorial"] {n :n} + (slurp (str "resources/public/tutorial/page" n ".html"))) \ No newline at end of file From a44c152f50f6834d4737e8d395e4a45c13a4bcab Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 29 Nov 2011 08:37:41 -0600 Subject: [PATCH 03/44] This used to be used more than once, but not anymore. --- src/tryclojure/views/home.clj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index db6f1a4..d1da94b 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -12,8 +12,6 @@ (link-to "http://disclojure.org" "Disclojure") (link-to "http://planet.clojure.in" "Planet Clojure")])) -(def github-link (link-to "http://github.com/Raynes/tryclojure" "github")) - (defpartial about-html [] [:p.bottom "Please note that this REPL is sandboxed, so you wont be able to do everything in it " @@ -26,7 +24,7 @@ "It'll be in an entirely new namespace/sandbox."] [:p.bottom "You can find the site's source and such on its " - github-link + (link-to "http://github.com/Raynes/tryclojure" "github") " page."] [:p.bottom "TryClojure is written in Clojure and JavaScript (JQuery), powered by " From 006cb693e8ce3a35d2eb598990870cb64617c871 Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 29 Nov 2011 09:57:58 -0600 Subject: [PATCH 04/44] Add some eval tests. --- test/tryclojure/core_test.clj | 6 ------ test/tryclojure/eval_test.clj | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) delete mode 100644 test/tryclojure/core_test.clj create mode 100644 test/tryclojure/eval_test.clj diff --git a/test/tryclojure/core_test.clj b/test/tryclojure/core_test.clj deleted file mode 100644 index d91e716..0000000 --- a/test/tryclojure/core_test.clj +++ /dev/null @@ -1,6 +0,0 @@ -(ns tryclojure.core-test - (:use [tryclojure.core] :reload-all) - (:use [clojure.test])) - -(deftest replace-me ;; FIXME: write - (is false)) diff --git a/test/tryclojure/eval_test.clj b/test/tryclojure/eval_test.clj new file mode 100644 index 0000000..041ae6c --- /dev/null +++ b/test/tryclojure/eval_test.clj @@ -0,0 +1,18 @@ +(ns tryclojure.eval-test + (:use tryclojure.models.eval + clojure.test) + (:require noir.session)) + +(def sb (make-sandbox)) + +(deftest eval-form-test + (let [form "(do (println 10) (+ 3 3))" + result (eval-string form sb)] + (is (= "10\n" (-> result :result first str))) + (is (= "6" (-> result :result second str))) + (is (= (read-string form) (-> result :expr))))) + +(alter-var-root #'noir.session/*noir-session* (constantly (atom {}))) + +(deftest eval-request-test + (is (= "Execution Timed Out!" (:message (eval-request "(while true)"))))) \ No newline at end of file From 8e132f046391b1c5fb2a383154f02ccf2f4a35ad Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 29 Nov 2011 10:06:38 -0600 Subject: [PATCH 05/44] Use jsonp from noir.response. --- src/tryclojure/views/eval.clj | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/tryclojure/views/eval.clj b/src/tryclojure/views/eval.clj index 782e40e..8010a34 100644 --- a/src/tryclojure/views/eval.clj +++ b/src/tryclojure/views/eval.clj @@ -1,16 +1,16 @@ (ns tryclojure.views.eval (:use [noir.core :only [defpage]] - [noir.response :only [json]] - [tryclojure.models.eval :only [eval-request]])) + [tryclojure.models.eval :only [eval-request]]) + (:require [noir.response :as resp])) (defpage "/eval.json" {:keys [expr jsonp]} - (update-in - (json - (let [{:keys [expr result error message] :as res} (eval-request expr)] - (if error - res - (let [[out res] result] - {:expr (pr-str expr) - :result (str out (pr-str res))})))) - [:body] - #(if jsonp (str jsonp "(" % ")") %))) \ No newline at end of file + (let [{:keys [expr result error message] :as res} (eval-request expr) + data (if error + res + (let [[out res] result] + {:expr (pr-str expr) + :result (str out (pr-str res))}))] + + (if jsonp + (resp/jsonp jsonp data) + (resp/json data)))) \ No newline at end of file From e271f59f20dd80c07357a6d44dcab8c5d0096b4d Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 29 Nov 2011 10:06:53 -0600 Subject: [PATCH 06/44] Add a .travis.yml file. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..4f42080 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: clojure \ No newline at end of file From b9d2d30f953620e45938d611c3e4c2838e089e71 Mon Sep 17 00:00:00 2001 From: Michael Kopinsky Date: Sun, 18 Dec 2011 11:28:43 -0500 Subject: [PATCH 07/44] Grammar fix --- resources/public/tutorial/page10.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/public/tutorial/page10.html b/resources/public/tutorial/page10.html index 9968bcb..f19c97b 100644 --- a/resources/public/tutorial/page10.html +++ b/resources/public/tutorial/page10.html @@ -11,7 +11,7 @@ Lists: '(1 2 3 4)
Sets: #{1 2 3 4}
Vectors and lists are sequential and ordered collections. You'll see vectors used much more than lists. - Maps are typical hash-maps. Unordered collections indexed by keys. The keys can be any object. Here, + Maps are typical hash-maps - unordered collections indexed by keys. The keys can be any object. Here, we've used a keyword, :foo as a key. Keywords make excellent keys. We also used a number. Sets are mathematical sets.

From 91cb8c4c71de121d8ab3b58c5190cf5ffe554bcd Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Sat, 5 May 2012 16:08:07 -0500 Subject: [PATCH 08/44] Rename README to README.md. --- README => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.md (100%) diff --git a/README b/README.md similarity index 100% rename from README rename to README.md From b2ebc38fc96d4a51c86398db9a1b3c25b44a454d Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Sat, 5 May 2012 16:10:52 -0500 Subject: [PATCH 09/44] Update to 1.4, get rid of leiningen tasks for fetching stuff. Updated all the dependencies and got rid of the Leiningen task for fetching javascript files. Instead, we're going to use a git submodule to fetch jquery-console and use a CDN for jquery itself. --- .gitignore | 1 - .gitmodules | 3 + project.clj | 7 +- .../javascript/jquery-console/.gitignore | 20 + .../public/javascript/jquery-console/README | 72 ++ .../javascript/jquery-console/demo.html | 194 ++++++ .../jquery-console/jquery-1.4.2.min.js | 154 +++++ .../jquery-console/jquery.console.js | 649 ++++++++++++++++++ src/leiningen/fetch_js.clj | 18 - src/tryclojure/models/eval.clj | 10 +- src/tryclojure/server.clj | 4 +- src/tryclojure/views/eval.clj | 6 +- src/tryclojure/views/home.clj | 13 +- src/tryclojure/views/tutorial.clj | 2 +- 14 files changed, 1112 insertions(+), 41 deletions(-) create mode 100644 .gitmodules create mode 100644 resources/public/javascript/jquery-console/.gitignore create mode 100644 resources/public/javascript/jquery-console/README create mode 100644 resources/public/javascript/jquery-console/demo.html create mode 100644 resources/public/javascript/jquery-console/jquery-1.4.2.min.js create mode 100644 resources/public/javascript/jquery-console/jquery.console.js delete mode 100644 src/leiningen/fetch_js.clj diff --git a/.gitignore b/.gitignore index 4f14c94..5fcc507 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ pom.xml lib classes *~ -resources/public/javascript/jquery* \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..9cf7391 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "resources/public/javascript/jquery-console"] + path = resources/public/javascript/jquery-console + url = https://github.com/chrisdone/jquery-console.git diff --git a/project.clj b/project.clj index c7974b4..cce6b10 100644 --- a/project.clj +++ b/project.clj @@ -1,13 +1,10 @@ (defproject tryclojure "0.1.0-SNAPSHOT" :description "A simple web-based Clojure REPL for trying out Clojure without having to install it." - :dependencies [[org.clojure/clojure "1.3.0"] - [noir "1.2.1"] + :dependencies [[org.clojure/clojure "1.4.0"] + [noir "1.3.0-beta3"] [commons-lang/commons-lang "2.5"] [clojail "0.5.1"]] - ;; For lein and Heroku compatibility. If you're using cake, add - ;; this line to .cake/config: jvm.opts = -Djava.security.policy=example.policy :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] - :hooks [leiningen.fetch-js] :main tryclojure.server) diff --git a/resources/public/javascript/jquery-console/.gitignore b/resources/public/javascript/jquery-console/.gitignore new file mode 100644 index 0000000..ac8f968 --- /dev/null +++ b/resources/public/javascript/jquery-console/.gitignore @@ -0,0 +1,20 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so +*.pyc + +# Logs and databases # +###################### +*.log + +# OS generated files # +###################### +.DS_Store* +ehthumbs.db +Icon? +Thumbs.db diff --git a/resources/public/javascript/jquery-console/README b/resources/public/javascript/jquery-console/README new file mode 100644 index 0000000..245420f --- /dev/null +++ b/resources/public/javascript/jquery-console/README @@ -0,0 +1,72 @@ +INTRODUCTION + +See demo.html. Or here: http://chrisdone.com/jquery-console/demo.html + +Options available: + + autofocus bool Autofocus the terminal, rather than + having to click on it. + + promptHistory bool Provide history support (kind of crappy, + needs doing properly.) + + historyPreserveColumn bool Preserve the column you were one when + switching between history. + + welcomeMessage string Just a first message to display on the + terminal. + + promptLabel string Prompt string like 'JavaScript> '. + + commandValidate function When user hits return, validate + whether to trigger commandHandle and + re-prompt. + + commandHandle function Handle the command line, return a + string, boolean, or list + of {msg:"foo",className:"my-css-class"}. + commandHandle(line,report) is + called. Report function is for you + to report a result of the command + asynchronously. + + animateScroll bool Whether to animate the scroll to + top. Currently disabled. + + charInsertTrigger function Predicate for whether to allow + character insertion. + charInsertTrigger(char,line) is called. + + cancelHandle function Handle a user-signaled interrupt. + +LICENSE + +Copyright 2010 Chris Done, Simon David Pratt. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above + copyright notice, this list of conditions and the following + disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials + provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + diff --git a/resources/public/javascript/jquery-console/demo.html b/resources/public/javascript/jquery-console/demo.html new file mode 100644 index 0000000..370ca73 --- /dev/null +++ b/resources/public/javascript/jquery-console/demo.html @@ -0,0 +1,194 @@ + + + + JQuery Console Demo + + + + + + + + + +

Simple console demo

+

Tested on:

+
    +
  • Internet Explorer 6
    • +
  • Opera 10.01
    • +
  • Chromium 4.0.237.0 (Ubuntu build 31094)
    • +
  • Firefox 3.5.8
    • +
+ + diff --git a/resources/public/javascript/jquery-console/jquery-1.4.2.min.js b/resources/public/javascript/jquery-console/jquery-1.4.2.min.js new file mode 100644 index 0000000..7c24308 --- /dev/null +++ b/resources/public/javascript/jquery-console/jquery-1.4.2.min.js @@ -0,0 +1,154 @@ +/*! + * jQuery JavaScript Library v1.4.2 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Sat Feb 13 22:33:48 2010 -0500 + */ +(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, +Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& +(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, +a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== +"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, +function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
a"; +var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, +parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= +false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= +s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, +applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; +else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, +a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== +w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, +cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= +c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); +a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, +function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); +k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), +C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= +e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& +f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; +if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", +e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, +"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, +d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, +e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); +t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| +g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, +CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, +g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, +text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, +setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= +h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== +"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, +h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& +q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; +if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); +(function(){var g=s.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: +function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= +{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== +"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", +d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? +a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== +1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, +""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); +return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", +""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= +c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? +c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= +function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= +Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, +"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= +a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= +a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== +"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, +serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), +function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, +global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& +e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? +"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== +false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= +false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", +c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| +d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); +g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== +1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== +"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; +if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== +"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| +c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; +this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= +this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, +e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
"; +a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); +c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, +d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- +f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": +"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in +e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); diff --git a/resources/public/javascript/jquery-console/jquery.console.js b/resources/public/javascript/jquery-console/jquery.console.js new file mode 100644 index 0000000..1766fb5 --- /dev/null +++ b/resources/public/javascript/jquery-console/jquery.console.js @@ -0,0 +1,649 @@ +// JQuery Console 1.0 +// Sun Feb 21 20:28:47 GMT 2010 +// +// Copyright 2010 Chris Done, Simon David Pratt. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above +// copyright notice, this list of conditions and the following +// disclaimer. +// +// 2. Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. + +// TESTED ON +// Internet Explorer 6 +// Opera 10.01 +// Chromium 4.0.237.0 (Ubuntu build 31094) +// Firefox 3.5.8, 3.6.2 (Mac) +// Safari 4.0.5 (6531.22.7) (Mac) +// Google Chrome 5.0.375.55 (Mac) + +(function($){ + $.fn.console = function(config){ + //////////////////////////////////////////////////////////////////////// + // Constants + // Some are enums, data types, others just for optimisation + var keyCodes = { + // left + 37: moveBackward, + // right + 39: moveForward, + // up + 38: previousHistory, + // down + 40: nextHistory, + // backspace + 8: backDelete, + // delete + 46: forwardDelete, + // end + 35: moveToEnd, + // start + 36: moveToStart, + // return + 13: commandTrigger, + // tab + 18: doNothing + }; + var ctrlCodes = { + // C-a + 65: moveToStart, + // C-e + 69: moveToEnd, + // C-d + 68: forwardDelete, + // C-n + 78: nextHistory, + // C-p + 80: previousHistory, + // C-b + 66: moveBackward, + // C-f + 70: moveForward, + // C-k + 75: deleteUntilEnd + }; + var altCodes = { + // M-f + 70: moveToNextWord, + // M-b + 66: moveToPreviousWord, + // M-d + 68: deleteNextWord + }; + var cursor = ' '; + + //////////////////////////////////////////////////////////////////////// + // Globals + var container = $(this); + var inner = $('
'); + // erjiang: changed this from a text input to a textarea so we + // can get pasted newlines + var typer = $(''); + // Prompt + var promptBox; + var prompt; + var promptLabel = config && config.promptLabel? config.promptLabel : "> "; + var continuedPromptLabel = config && config.continuedPromptLabel? + config.continuedPromptLabel : "> "; + var column = 0; + var promptText = ''; + var restoreText = ''; + var continuedText = ''; + // Prompt history stack + var history = []; + var ringn = 0; + // For reasons unknown to The Sword of Michael himself, Opera + // triggers and sends a key character when you hit various + // keys like PgUp, End, etc. So there is no way of knowing + // when a user has typed '#' or End. My solution is in the + // typer.keydown and typer.keypress functions; I use the + // variable below to ignore the keypress event if the keydown + // event succeeds. + var cancelKeyPress = 0; + // When this value is false, the prompt will not respond to input + var acceptInput = true; + // When this value is true, the command has been canceled + var cancelCommand = false; + + // External exports object + var extern = {}; + + //////////////////////////////////////////////////////////////////////// + // Main entry point + (function(){ + container.append(inner); + inner.append(typer); + typer.css({position:'absolute',top:0,left:'-9999px'}); + if (config.welcomeMessage) + message(config.welcomeMessage,'jquery-console-welcome'); + newPromptBox(); + if (config.autofocus) { + inner.addClass('jquery-console-focus'); + typer.focus(); + setTimeout(function(){ + inner.addClass('jquery-console-focus'); + typer.focus(); + },100); + } + extern.inner = inner; + extern.typer = typer; + extern.scrollToBottom = scrollToBottom; + })(); + + //////////////////////////////////////////////////////////////////////// + // Reset terminal + extern.reset = function(){ + var welcome = (typeof config.welcomeMessage != 'undefined'); + inner.parent().fadeOut(function(){ + inner.find('div').each(function(){ + if (!welcome) { + $(this).remove(); + } else { + welcome = false; + } + }); + newPromptBox(); + inner.parent().fadeIn(function(){ + inner.addClass('jquery-console-focus'); + typer.focus(); + }); + }); + }; + + //////////////////////////////////////////////////////////////////////// + // Reset terminal + extern.notice = function(msg,style){ + var n = $('
').append($('
').text(msg)) + .css({visibility:'hidden'}); + container.append(n); + var focused = true; + if (style=='fadeout') + setTimeout(function(){ + n.fadeOut(function(){ + n.remove(); + }); + },4000); + else if (style=='prompt') { + var a = $('
OK
'); + n.append(a); + focused = false; + a.click(function(){ n.fadeOut(function(){ n.remove();inner.css({opacity:1}) }); }); + } + var h = n.height(); + n.css({height:'0px',visibility:'visible'}) + .animate({height:h+'px'},function(){ + if (!focused) inner.css({opacity:0.5}); + }); + n.css('cursor','default'); + return n; + }; + + //////////////////////////////////////////////////////////////////////// + // Make a new prompt box + function newPromptBox() { + column = 0; + promptText = ''; + ringn = 0; // Reset the position of the history ring + enableInput(); + promptBox = $('
'); + var label = $(''); + var labelText = extern.continuedPrompt? continuedPromptLabel : promptLabel; + promptBox.append(label.text(labelText).show()); + label.html(label.html().replace(' ',' ')); + prompt = $(''); + promptBox.append(prompt); + inner.append(promptBox); + updatePromptDisplay(); + }; + + //////////////////////////////////////////////////////////////////////// + // Handle setting focus + container.click(function(){ + inner.addClass('jquery-console-focus'); + inner.removeClass('jquery-console-nofocus'); + typer.focus(); + scrollToBottom(); + return false; + }); + + //////////////////////////////////////////////////////////////////////// + // Handle losing focus + typer.blur(function(){ + inner.removeClass('jquery-console-focus'); + inner.addClass('jquery-console-nofocus'); + }); + + //////////////////////////////////////////////////////////////////////// + // Bind to the paste event of the input box so we know when we + // get pasted data + typer.bind('paste', function(e) { + // wipe typer input clean just in case + typer.val(""); + // this timeout is required because the onpaste event is + // fired *before* the text is actually pasted + setTimeout(function() { + typer.consoleInsert(typer.val()); + typer.val(""); + }, 0); + }); + + //////////////////////////////////////////////////////////////////////// + // Handle key hit before translation + // For picking up control characters like up/left/down/right + + typer.keydown(function(e){ + cancelKeyPress = 0; + var keyCode = e.keyCode; + // C-c: cancel the execution + if(e.ctrlKey && keyCode == 67) { + cancelKeyPress = keyCode; + cancelExecution(); + return false; + } + if (acceptInput) { + if (keyCode in keyCodes) { + cancelKeyPress = keyCode; + (keyCodes[keyCode])(); + return false; + } else if (e.ctrlKey && keyCode in ctrlCodes) { + cancelKeyPress = keyCode; + (ctrlCodes[keyCode])(); + return false; + } else if (e.altKey && keyCode in altCodes) { + cancelKeyPress = keyCode; + (altCodes[keyCode])(); + return false; + } + } + }); + + //////////////////////////////////////////////////////////////////////// + // Handle key press + typer.keypress(function(e){ + var keyCode = e.keyCode || e.which; + if (isIgnorableKey(e)) { + return false; + } + // // C-v: don't insert on paste event + if ((e.ctrlKey || e.metaKey) && String.fromCharCode(keyCode).toLowerCase() == 'v') { + return true; + } + if (acceptInput && cancelKeyPress != keyCode && keyCode >= 32){ + if (cancelKeyPress) return false; + if (typeof config.charInsertTrigger == 'undefined' || + (typeof config.charInsertTrigger == 'function' && + config.charInsertTrigger(keyCode,promptText))) + typer.consoleInsert(keyCode); + } + if ($.browser.webkit) return false; + }); + + function isIgnorableKey(e) { + // for now just filter alt+tab that we receive on some platforms when + // user switches windows (goes away from the browser) + return ((e.keyCode == keyCodes.tab || e.keyCode == 192) && e.altKey); + }; + + //////////////////////////////////////////////////////////////////////// + // Rotate through the command history + function rotateHistory(n){ + if (history.length == 0) return; + ringn += n; + if (ringn < 0) ringn = history.length; + else if (ringn > history.length) ringn = 0; + var prevText = promptText; + if (ringn == 0) { + promptText = restoreText; + } else { + promptText = history[ringn - 1]; + } + if (config.historyPreserveColumn) { + if (promptText.length < column + 1) { + column = promptText.length; + } else if (column == 0) { + column = promptText.length; + } + } else { + column = promptText.length; + } + updatePromptDisplay(); + }; + + function previousHistory() { + rotateHistory(-1); + }; + + function nextHistory() { + rotateHistory(1); + }; + + // Add something to the history ring + function addToHistory(line){ + history.push(line); + restoreText = ''; + }; + + // Delete the character at the current position + function deleteCharAtPos(){ + if (column < promptText.length){ + promptText = + promptText.substring(0,column) + + promptText.substring(column+1); + restoreText = promptText; + return true; + } else return false; + }; + + function backDelete() { + if (moveColumn(-1)){ + deleteCharAtPos(); + updatePromptDisplay(); + } + }; + + function forwardDelete() { + if (deleteCharAtPos()) + updatePromptDisplay(); + }; + + function deleteUntilEnd() { + while(deleteCharAtPos()) { + updatePromptDisplay(); + } + }; + + function deleteNextWord() { + // A word is defined within this context as a series of alphanumeric + // characters. + // Delete up to the next alphanumeric character + while(column < promptText.length && + !isCharAlphanumeric(promptText[column])) { + deleteCharAtPos(); + updatePromptDisplay(); + } + // Then, delete until the next non-alphanumeric character + while(column < promptText.length && + isCharAlphanumeric(promptText[column])) { + deleteCharAtPos(); + updatePromptDisplay(); + } + }; + + //////////////////////////////////////////////////////////////////////// + // Validate command and trigger it if valid, or show a validation error + function commandTrigger() { + var line = promptText; + if (typeof config.commandValidate == 'function') { + var ret = config.commandValidate(line); + if (ret == true || ret == false) { + if (ret) { + handleCommand(); + } + } else { + commandResult(ret,"jquery-console-message-error"); + } + } else { + handleCommand(); + } + }; + + // Scroll to the bottom of the view + function scrollToBottom() { + if (jQuery.fn.jquery > "1.6") { + inner.prop({ scrollTop: inner.prop("scrollHeight") }); + } + else { + inner.attr({ scrollTop: inner.attr("scrollHeight") }); + } + }; + + function cancelExecution() { + if(typeof config.cancelHandle == 'function') { + config.cancelHandle(); + } + } + + //////////////////////////////////////////////////////////////////////// + // Handle a command + function handleCommand() { + if (typeof config.commandHandle == 'function') { + disableInput(); + addToHistory(promptText); + var text = promptText; + if (extern.continuedPrompt) { + if (continuedText) + continuedText += '\n' + promptText; + else continuedText = promptText; + } else continuedText = undefined; + if (continuedText) text = continuedText; + var ret = config.commandHandle(text,function(msgs){ + commandResult(msgs); + }); + if (extern.continuedPrompt && !continuedText) + continuedText = promptText; + if (typeof ret == 'boolean') { + if (ret) { + // Command succeeded without a result. + commandResult(); + } else { + commandResult('Command failed.', + "jquery-console-message-error"); + } + } else if (typeof ret == "string") { + commandResult(ret,"jquery-console-message-success"); + } else if (typeof ret == 'object' && ret.length) { + commandResult(ret); + } else if (extern.continuedPrompt) { + commandResult(); + } + } + }; + + //////////////////////////////////////////////////////////////////////// + // Disable input + function disableInput() { + acceptInput = false; + }; + + // Enable input + function enableInput() { + acceptInput = true; + } + + //////////////////////////////////////////////////////////////////////// + // Reset the prompt in invalid command + function commandResult(msg,className) { + column = -1; + updatePromptDisplay(); + if (typeof msg == 'string') { + message(msg,className); + } else if ($.isArray(msg)) { + for (var x in msg) { + var ret = msg[x]; + message(ret.msg,ret.className); + } + } else { // Assume it's a DOM node or jQuery object. + inner.append(msg); + } + newPromptBox(); + }; + + //////////////////////////////////////////////////////////////////////// + // Display a message + function message(msg,className) { + var mesg = $('
'); + if (className) mesg.addClass(className); + mesg.filledText(msg).hide(); + inner.append(mesg); + mesg.show(); + }; + + //////////////////////////////////////////////////////////////////////// + // Handle normal character insertion + // data can either be a number, which will be interpreted as the + // numeric value of a single character, or a string + typer.consoleInsert = function(data){ + // TODO: remove redundant indirection + var text = isNaN(data) ? data : String.fromCharCode(data); + var before = promptText.substring(0,column); + var after = promptText.substring(column); + promptText = before + text + after; + moveColumn(text.length); + restoreText = promptText; + updatePromptDisplay(); + }; + + //////////////////////////////////////////////////////////////////////// + // Move to another column relative to this one + // Negative means go back, positive means go forward. + function moveColumn(n){ + if (column + n >= 0 && column + n <= promptText.length){ + column += n; + return true; + } else return false; + }; + + function moveForward() { + if(moveColumn(1)) { + updatePromptDisplay(); + return true; + } + return false; + }; + + function moveBackward() { + if(moveColumn(-1)) { + updatePromptDisplay(); + return true; + } + return false; + }; + + function moveToStart() { + if (moveColumn(-column)) + updatePromptDisplay(); + }; + + function moveToEnd() { + if (moveColumn(promptText.length-column)) + updatePromptDisplay(); + }; + + function moveToNextWord() { + while(column < promptText.length && + !isCharAlphanumeric(promptText[column]) && + moveForward()) { + } + while(column < promptText.length && + isCharAlphanumeric(promptText[column]) && + moveForward()) { + } + }; + + function moveToPreviousWord() { + // Move backward until we find the first alphanumeric + while(column -1 >= 0 && + !isCharAlphanumeric(promptText[column-1]) && + moveBackward()) { + } + // Move until we find the first non-alphanumeric + while(column -1 >= 0 && + isCharAlphanumeric(promptText[column-1]) && + moveBackward()) { + } + }; + + function isCharAlphanumeric(charToTest) { + if(typeof charToTest == 'string') { + var code = charToTest.charCodeAt(); + return (code >= 'A'.charCodeAt() && code <= 'Z'.charCodeAt()) || + (code >= 'a'.charCodeAt() && code <= 'z'.charCodeAt()) || + (code >= '0'.charCodeAt() && code <= '9'.charCodeAt()); + } + return false; + }; + + function doNothing() {}; + + extern.promptText = function(text){ + if (text) { + promptText = text; + column = promptText.length; + updatePromptDisplay(); + } + return promptText; + }; + + //////////////////////////////////////////////////////////////////////// + // Update the prompt display + function updatePromptDisplay(){ + var line = promptText; + var html = ''; + if (column > 0 && line == ''){ + // When we have an empty line just display a cursor. + html = cursor; + } else if (column == promptText.length){ + // We're at the end of the line, so we need to display + // the text *and* cursor. + html = htmlEncode(line) + cursor; + } else { + // Grab the current character, if there is one, and + // make it the current cursor. + var before = line.substring(0, column); + var current = line.substring(column,column+1); + if (current){ + current = + '' + + htmlEncode(current) + + ''; + } + var after = line.substring(column+1); + html = htmlEncode(before) + current + htmlEncode(after); + } + prompt.html(html); + scrollToBottom(); + }; + + // Simple HTML encoding + // Simply replace '<', '>' and '&' + // TODO: Use jQuery's .html() trick, or grab a proper, fast + // HTML encoder. + function htmlEncode(text){ + return ( + text.replace(/&/g,'&') + .replace(/') + ); + }; + + return extern; + }; + // Simple utility for printing messages + $.fn.filledText = function(txt){ + $(this).text(txt); + $(this).html($(this).html().replace(/\n/g,'
')); + return this; + }; +})(jQuery); diff --git a/src/leiningen/fetch_js.clj b/src/leiningen/fetch_js.clj deleted file mode 100644 index bbc9122..0000000 --- a/src/leiningen/fetch_js.clj +++ /dev/null @@ -1,18 +0,0 @@ -(ns leiningen.fetch-js - (:use [leiningen.core :only [prepend-tasks]] - [leiningen.deps :only [deps]]) - (:require [clojure.java.io :as io])) - -(defn fetch-js [project] - (let [js (io/file "resources" "public" "javascript") - jquery (io/file js "jquery-1.4.2.min.js") - console (io/file js "jquery.console.js")] - (when-not (.exists jquery) - (println "Downloading jquery.") - (io/copy (io/reader "http://code.jquery.com/jquery-1.4.2.min.js") jquery)) - (when-not (.exists console) - (println "Downloading jquery-console.") - (io/copy (io/reader "https://raw.github.com/chrisdone/jquery-console/055c2c212944349ddbb045e8536ebfb2192acb80/jquery.console.js") - console)))) - -(prepend-tasks #'deps fetch-js) \ No newline at end of file diff --git a/src/tryclojure/models/eval.clj b/src/tryclojure/models/eval.clj index da9b1f1..09f0d24 100644 --- a/src/tryclojure/models/eval.clj +++ b/src/tryclojure/models/eval.clj @@ -1,8 +1,8 @@ (ns tryclojure.models.eval - (:use [clojail.testers :only [secure-tester-without-def]] - [clojail.core :only [sandbox]] - [clojure.stacktrace :only [root-cause]]) - (:require [noir.session :as session]) + (:require [clojail.testers :refer [secure-tester-without-def]] + [clojail.core :refer [sandbox]] + [clojure.stacktrace :refer [root-cause]] + [noir.session :as session]) (:import java.io.StringWriter java.util.concurrent.TimeoutException)) @@ -23,7 +23,7 @@ (defn make-sandbox [] (sandbox try-clojure-tester :timeout 2000 - :init '(do (use '[clojure.repl :only [doc]]) + :init '(do (require '[clojure.repl :refer [doc]]) (future (Thread/sleep 600000) (-> *ns* .getName remove-ns))))) diff --git a/src/tryclojure/server.clj b/src/tryclojure/server.clj index a606a15..08eeedc 100644 --- a/src/tryclojure/server.clj +++ b/src/tryclojure/server.clj @@ -1,6 +1,6 @@ (ns tryclojure.server - (:use [ring.middleware.file :only [wrap-file]]) - (:require [noir.server :as server])) + (:require [noir.server :as server] + [ring.middleware.file :refer [wrap-file]])) (server/add-middleware wrap-file (System/getProperty "user.dir")) (server/load-views "src/tryclojure/views") diff --git a/src/tryclojure/views/eval.clj b/src/tryclojure/views/eval.clj index 8010a34..f9d0ff4 100644 --- a/src/tryclojure/views/eval.clj +++ b/src/tryclojure/views/eval.clj @@ -1,7 +1,7 @@ (ns tryclojure.views.eval - (:use [noir.core :only [defpage]] - [tryclojure.models.eval :only [eval-request]]) - (:require [noir.response :as resp])) + (:require [noir.core :refer [defpage]] + [tryclojure.models.eval :refer [eval-request]] + [noir.response :as resp])) (defpage "/eval.json" {:keys [expr jsonp]} (let [{:keys [expr result error message] :as res} (eval-request expr) diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index d1da94b..0efeebb 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -1,6 +1,7 @@ (ns tryclojure.views.home - (:use [noir.core :only [defpartial defpage]] - [hiccup form-helpers page-helpers])) + (:require [noir.core :refer [defpartial defpage]] + [hiccup.element :refer [javascript-tag link-to unordered-list]] + [hiccup.page :refer [include-css include-js html5]])) (defpartial links [] (unordered-list @@ -43,12 +44,12 @@ (link-to "http://github.com/Raynes/tryclojure" "github") "!"]) -(defpartial root-html [] - (html4 +(defn root-html [] + (html5 [:head (include-css "/resources/public/css/tryclojure.css") - (include-js "/resources/public/javascript/jquery-1.4.2.min.js" - "/resources/public/javascript/jquery.console.js" + (include-js "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" + "/resources/public/javascript/jquery-console/jquery.console.js" "/resources/public/javascript/tryclojure.js") [:title "Try Clojure"]] [:body diff --git a/src/tryclojure/views/tutorial.clj b/src/tryclojure/views/tutorial.clj index 69538ad..f7ee2b2 100644 --- a/src/tryclojure/views/tutorial.clj +++ b/src/tryclojure/views/tutorial.clj @@ -1,5 +1,5 @@ (ns tryclojure.views.tutorial - (:use [noir.core :only [defpage]])) + (:require [noir.core :refer [defpage]])) (defpage [:post "/tutorial"] {n :n} (slurp (str "resources/public/tutorial/page" n ".html"))) \ No newline at end of file From daafa51c63bfc1cd74942ea8b340068b53f46798 Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Thu, 28 Jun 2012 16:03:28 -0500 Subject: [PATCH 10/44] Upgrade clojail. --- project.clj | 4 ++-- src/tryclojure/models/eval.clj | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index cce6b10..c4bfcb1 100644 --- a/project.clj +++ b/project.clj @@ -1,9 +1,9 @@ (defproject tryclojure "0.1.0-SNAPSHOT" :description "A simple web-based Clojure REPL for trying out Clojure without having to install it." :dependencies [[org.clojure/clojure "1.4.0"] - [noir "1.3.0-beta3"] + [noir "1.3.0-beta10"] [commons-lang/commons-lang "2.5"] - [clojail "0.5.1"]] + [clojail "0.6.0"]] :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] :main tryclojure.server) diff --git a/src/tryclojure/models/eval.clj b/src/tryclojure/models/eval.clj index 09f0d24..50aa8b0 100644 --- a/src/tryclojure/models/eval.clj +++ b/src/tryclojure/models/eval.clj @@ -1,5 +1,5 @@ (ns tryclojure.models.eval - (:require [clojail.testers :refer [secure-tester-without-def]] + (:require [clojail.testers :refer [secure-tester-without-def blanket]] [clojail.core :refer [sandbox]] [clojure.stacktrace :refer [root-cause]] [noir.session :as session]) @@ -17,8 +17,7 @@ (eval-form form sbox))) (def try-clojure-tester - (into secure-tester-without-def - #{'tryclojure.core})) + (blanket secure-tester-without-def "tryclojure")) (defn make-sandbox [] (sandbox try-clojure-tester From 67f8beeb1a826f382efec54a54d2425ac6c317a2 Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Mon, 2 Jul 2012 23:52:30 -0500 Subject: [PATCH 11/44] Inc clojail version. --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index c4bfcb1..8aed13e 100644 --- a/project.clj +++ b/project.clj @@ -3,7 +3,7 @@ :dependencies [[org.clojure/clojure "1.4.0"] [noir "1.3.0-beta10"] [commons-lang/commons-lang "2.5"] - [clojail "0.6.0"]] + [clojail "0.6.1"]] :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] :main tryclojure.server) From 68834e71d9ea955c05f430bafe650bfd5347b34d Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Wed, 5 Sep 2012 16:55:06 -0500 Subject: [PATCH 12/44] Update clojail. --- project.clj | 2 +- src/tryclojure/models/eval.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 8aed13e..7ae763e 100644 --- a/project.clj +++ b/project.clj @@ -3,7 +3,7 @@ :dependencies [[org.clojure/clojure "1.4.0"] [noir "1.3.0-beta10"] [commons-lang/commons-lang "2.5"] - [clojail "0.6.1"]] + [clojail "1.0.1"]] :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] :main tryclojure.server) diff --git a/src/tryclojure/models/eval.clj b/src/tryclojure/models/eval.clj index 50aa8b0..9a05b0c 100644 --- a/src/tryclojure/models/eval.clj +++ b/src/tryclojure/models/eval.clj @@ -17,7 +17,7 @@ (eval-form form sbox))) (def try-clojure-tester - (blanket secure-tester-without-def "tryclojure")) + (conj secure-tester-without-def (blanket "tryclojure" "noir"))) (defn make-sandbox [] (sandbox try-clojure-tester From 10644117c4b51f18e12530869bc6ff8abcb0939d Mon Sep 17 00:00:00 2001 From: Trevor Hartman Date: Mon, 1 Oct 2012 11:36:36 -0700 Subject: [PATCH 13/44] Allow source from clojure.repl in addition to doc --- src/tryclojure/models/eval.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tryclojure/models/eval.clj b/src/tryclojure/models/eval.clj index 9a05b0c..810f862 100644 --- a/src/tryclojure/models/eval.clj +++ b/src/tryclojure/models/eval.clj @@ -22,7 +22,7 @@ (defn make-sandbox [] (sandbox try-clojure-tester :timeout 2000 - :init '(do (require '[clojure.repl :refer [doc]]) + :init '(do (require '[clojure.repl :refer [doc source]]) (future (Thread/sleep 600000) (-> *ns* .getName remove-ns))))) @@ -37,4 +37,4 @@ (catch TimeoutException _ {:error true :message "Execution Timed Out!"}) (catch Exception e - {:error true :message (str (root-cause e))}))) \ No newline at end of file + {:error true :message (str (root-cause e))}))) From 6c1ca1f100e24945682308cce2dbb5623b5ccda2 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 01:56:37 +0100 Subject: [PATCH 14/44] add Travis build status to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 67d773e..c7be349 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ TryClojure is a online Clojure REPL written using Noir and Chris Done's jquery console (you're awesome, Chris). +[](http://travis-ci.org/Raynes/tryclojure) + ## Usage http://tryclj.com From e780a6a831f5d5c933c48c143bbb241012b98166 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 13:56:48 +0100 Subject: [PATCH 15/44] fix indentation in project file --- project.clj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 7ae763e..81f6fb5 100644 --- a/project.clj +++ b/project.clj @@ -2,9 +2,7 @@ :description "A simple web-based Clojure REPL for trying out Clojure without having to install it." :dependencies [[org.clojure/clojure "1.4.0"] [noir "1.3.0-beta10"] - [commons-lang/commons-lang "2.5"] + [commons-lang/commons-lang "2.5"] [clojail "1.0.1"]] :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] :main tryclojure.server) - - From 73ce6f5ef7fd14a9c87bf34545ba5b9a77bb7a64 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 15:15:20 +0100 Subject: [PATCH 16/44] add "Fork me on GitHub" banner --- resources/public/css/gh-fork-ribbon.css | 74 +++++++++++++++++++++++++ src/tryclojure/views/home.clj | 18 +++--- 2 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 resources/public/css/gh-fork-ribbon.css diff --git a/resources/public/css/gh-fork-ribbon.css b/resources/public/css/gh-fork-ribbon.css new file mode 100644 index 0000000..d5c21cf --- /dev/null +++ b/resources/public/css/gh-fork-ribbon.css @@ -0,0 +1,74 @@ +/* From https://github.com/simonwhitaker/github-fork-ribbon-css */ + +/* Left will inherit from right (so we don't need to duplicate code */ +.github-fork-ribbon { + /* The right and left lasses determine the side we attach our banner to */ + position: absolute; + + /* Add a bit of padding to give some substance outside the "stitching" */ + padding: 2px 0; + + /* Set the base colour */ + background-color: #5881d8; + + /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */ + background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0.00)), to(rgba(0, 0, 0, 0.15))); + background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15)); + background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15)); + background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15)); + background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15)); + background-image: linear-gradient(top, rgba(0, 0, 0, 0.00), rgba(0, 0, 0, 0.15)); + filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,StartColorStr='#000000', EndColorStr='#000000'); + + /* Add a drop shadow */ + -webkit-box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 2px 3px 0px rgba(0, 0, 0, 0.5); +} +.github-fork-ribbon a { + /* Set the font */ + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + font-weight: 700; + color: white; + + /* Set the text properties */ + text-decoration: none; + text-shadow: 0 -1px rgba(0,0,0,0.5); + text-align: center; + + /* Set the geometry. If you fiddle with these you'll also need to tweak the top and right values in #github-fork-ribbon. */ + width: 200px; + line-height: 20px; + + /* Set the layout properties */ + display: inline-block; + padding: 2px 0; + + /* Add "stitching" effect */ + border-width: 1px 0; + border-style: dotted; + border-color: rgba(255,255,255,0.7); +} + +.github-fork-ribbon-wrapper { + width: 150px; + height: 150px; + position: absolute; + overflow: hidden; + top: 0; +} + +.github-fork-ribbon-wrapper.right { + right: 0; +} + +.github-fork-ribbon-wrapper.right .github-fork-ribbon { + top: 42px; + right: -43px; + + /* Rotate the banner 45 degrees */ + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 0efeebb..b63e4dd 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -23,10 +23,6 @@ "The sandbox wipes defs if you def too many things, so don't be surprised. Furthermore, " "The sandbox will automatically be wiped after 15 minutes and if you evaluate more after that," "It'll be in an entirely new namespace/sandbox."] - [:p.bottom - "You can find the site's source and such on its " - (link-to "http://github.com/Raynes/tryclojure" "github") - " page."] [:p.bottom "TryClojure is written in Clojure and JavaScript (JQuery), powered by " (link-to "https://github.com/flatland/clojail" "clojail") @@ -38,22 +34,24 @@ [:p.bottom "Welcome to Try Clojure. See that little box up there? That's a Clojure repl. You can type " "expressions and see their results right here in your browser. We also have a brief tutorial to " - "give you a taste of Clojure. Try it out by typing " [:code.expr "tutorial"] " in the console!"] - [:p.bottom - "Check out the site's source on " - (link-to "http://github.com/Raynes/tryclojure" "github") - "!"]) + "give you a taste of Clojure. Try it out by typing " [:code.expr "tutorial"] " in the console!"]) (defn root-html [] (html5 [:head - (include-css "/resources/public/css/tryclojure.css") + (include-css "/resources/public/css/tryclojure.css" + "/resources/public/css/gh-fork-ribbon.css") (include-js "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" "/resources/public/javascript/jquery-console/jquery.console.js" "/resources/public/javascript/tryclojure.js") [:title "Try Clojure"]] [:body [:div#wrapper + [:div.github-fork-ribbon-wrapper.right + [:div.github-fork-ribbon + (link-to "https://github.com/Raynes/tryclojure" "Fork me on GitHub") + ] + ] [:div#content [:div#header [:h1 From d4c1e2acfcd8b982069c26109514f943828066aa Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 15:20:37 +0100 Subject: [PATCH 17/44] .gitignore lein deps file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5fcc507..102c661 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ pom.xml lib classes *~ +.lein-deps-sum From c4003a295849e6e51a88343bbc505ac233a25ddd Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 15:20:58 +0100 Subject: [PATCH 18/44] clean up copyright line --- src/tryclojure/views/home.clj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index b63e4dd..0f2b03b 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -65,9 +65,7 @@ [:a#about.buttons.last "about"]] [:div#changer (home-html)]] [:div.footer - [:p.bottom "©2011 Anthony Grimes and numerous contributors"] - [:p.bottom - "Built with " + [:p.bottom "©2011-2012 Anthony Grimes and numerous contributors. Built with " (link-to "http://webnoir.org" "Noir") "."]] (javascript-tag From 62c2706eb67320c274313fcf2e09a7b49ebe4dd8 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 18:27:37 +0100 Subject: [PATCH 19/44] change text --- resources/public/javascript/tryclojure.js | 4 +-- resources/public/tutorial/page1.html | 12 ++----- resources/public/tutorial/page10.html | 35 +++++++++++-------- resources/public/tutorial/page11.html | 13 ++++--- resources/public/tutorial/page2.html | 7 ++-- resources/public/tutorial/page3.html | 13 +++---- resources/public/tutorial/page4.html | 8 ++--- resources/public/tutorial/page5.html | 9 ++--- resources/public/tutorial/page6.html | 9 ++--- resources/public/tutorial/page7.html | 13 +++---- resources/public/tutorial/page8.html | 17 +++++---- resources/public/tutorial/page9.html | 16 +++++---- src/tryclojure/views/home.clj | 42 ++++++++++------------- 13 files changed, 97 insertions(+), 101 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 4e04303..1e0256c 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -166,8 +166,8 @@ var controller; $(document).ready(function() { controller = $("#console").console({ - welcomeMessage:'Enter some Clojure code to be evaluated.', - promptLabel: 'Clojure> ', + welcomeMessage:'Give me some Clojure:', + promptLabel: '> ', commandValidate: onValidate, commandHandle: onHandle, autofocus:true, diff --git a/resources/public/tutorial/page1.html b/resources/public/tutorial/page1.html index 7ffd325..4654fcb 100644 --- a/resources/public/tutorial/page1.html +++ b/resources/public/tutorial/page1.html @@ -1,15 +1,7 @@

- This tutorial isn't entirely complete yet. More fun content is to be written. Stay tuned. + I'll take you on a 5-minutes tour of Clojure, but feel free to experiment on your own along the road!

- Above, you have your REPL. Please try the examples as we go along, and by all means experiment - with concepts independently. Should you refuse, you will promptly be IP banned from this - website, and a teddy bear will eat your candies. ctrl+v to paste and ctrl+c to copy like you - would normally expect, but you can't paste with your browser's right-click menu. -

- -

- You can type 'next' to move forward, 'back' to go back to the previous step, and 'restart' to - restart the tutorial. Go ahead and type 'next' to begin + You can type next to skip forward, back to return to the previous step, and restart to get back to the beginning. Let's get started: type next.

diff --git a/resources/public/tutorial/page10.html b/resources/public/tutorial/page10.html index f19c97b..5b43a30 100644 --- a/resources/public/tutorial/page10.html +++ b/resources/public/tutorial/page10.html @@ -1,30 +1,35 @@ -

Awesome. Now you can call this function just like we called the old square function.

+

+ Success! Now you can call this new square function just like you called the old square function. +

- Clojure has a great set of immutable and persistent data structures. Vectors, lists, maps, sets, - I get chills. + By now, you know that lists are quite important in Clojure. + But Clojure also has other data structures:

Vectors: [1 2 3 4]
Maps: {:foo "bar" 3 4}
- Lists: '(1 2 3 4)
Sets: #{1 2 3 4}
- Vectors and lists are sequential and ordered collections. You'll see vectors used much more than lists. - Maps are typical hash-maps - unordered collections indexed by keys. The keys can be any object. Here, - we've used a keyword, :foo as a key. Keywords make excellent keys. We also used a number. - Sets are mathematical sets.

- Clojure's collections are one of the most imporant parts of Clojure. Being a functional language, Clojure - encourages immutability and as little state as possible. Therefore, instead of for loops mutating variables - and such, most of the time you'll see higher order functions doing transformations on immutable data and - returning new collections rather than ever modifying the old one. + Vectors and lists are sequential and ordered collections. + Sets are not ordered, and they cannot contain duplicate elements. + Maps are key-value collections, where the keys can be any object. + Here, we've used what Clojure calls a keyword (:foo) for one of the keys, and a number for the other key. +

+ +

+ Now I'll tell you another thing that may surprise you: Clojure collections are immutable - they can never change. + When you do anything on a list, including adding and removing elements, you actually get a brand new list. + (Fortunately, Clojure is amazingly efficient at creating new lists). + In general, Clojure encourages you to have as little mutable state as possible. + For example, instead of "for" loops and other state-changing constructs, most of the time you'll see functions doing transformations on immutable data and returning new collections, without changing the old one.

- A prime example of this is map. We can use map, a higher order function (which is a function - that takes functions as arguments or returns functions), to 'map' a function to every element of a sequence. - Let's use this to increment each number in a vector. Type (map inc [1 2 3 4]) to continue. + A prime example of this is map. map is a higher order function, which means that it takes another function as an argument. + For example, you can ask map to increment each number in a vector by passing it the inc function, followed by the vector. + Try it for yourself: type (map inc [1 2 3 4]) to continue.

diff --git a/resources/public/tutorial/page11.html b/resources/public/tutorial/page11.html index da67d0a..726fe3c 100644 --- a/resources/public/tutorial/page11.html +++ b/resources/public/tutorial/page11.html @@ -1,8 +1,11 @@ -

Excellent work.

+

Great job!

- Well, that's all there is right now. This tutorial is still a work in progress, and I'm working on more - steps. If anybody wants to contribute, you can find a link to the Github repository on the 'about' page. - Furthermore, if you're just a brand new Clojure developer looking for some learning experiences, check - out the 'links' page. You'll find links to some tutorials and such there. + We've only scratched the surface of Clojure and its mind-bending power. + This tutorial is still a work in progress, and I'm working on more steps. + Meanwhile, you can learn more about Clojure by visiting the 'links' page. +

+ +

+ Welcome to your adventures in Clojure, and be prepared to be surprised and delighted every step of the way!

diff --git a/resources/public/tutorial/page2.html b/resources/public/tutorial/page2.html index acd317f..1d11c62 100644 --- a/resources/public/tutorial/page2.html +++ b/resources/public/tutorial/page2.html @@ -1,6 +1,7 @@

- I bet you're curious to find out what Clojure code looks like, aren't you? Sure you are. - Well, I've give you a hint: it's made up of lists. Let's do some arithmetic. + The first thing you may notice about Clojure is that common operations look... strange.

-(+ 3 3) +

+ For example, try typing (+ 3 3) in the REPL. +

diff --git a/resources/public/tutorial/page3.html b/resources/public/tutorial/page3.html index 925f30e..4edd21e 100644 --- a/resources/public/tutorial/page3.html +++ b/resources/public/tutorial/page3.html @@ -1,12 +1,13 @@

- Excellent work! There are other arithmetic functions. + That was a strange way to say "three plus three", wasn't it?

-* -- -/

- Try them out. Save / for last (don't worry, I have a reason!). + A Clojure program is made of lists. + (+ 3 3) is a list that contains an operator, and then the operands. + Try out the same concept with the * and - operators.

-

Once you're finished playing around, try (/ 10 3).

+

+ Division might surprise you. When you're ready to move forward, try (/ 10 3). +

diff --git a/resources/public/tutorial/page4.html b/resources/public/tutorial/page4.html index 0d06d50..991dc20 100644 --- a/resources/public/tutorial/page4.html +++ b/resources/public/tutorial/page4.html @@ -1,8 +1,4 @@

- I bet that caught you by surprise, didn't it? Don't fear! Clojure simply has a built in Rational type. - We can prove that we've got a rational by running (type (/ 10 3)). Rationals are more - concise and precise than floating point numbers. However, we can force Clojure to do floating point - division by just making one of our numbers floating point. + Now, that was a bit surprising: Clojure has a built in Rational type. + You can still force Clojure to do floating point division by making one of the operands floating point: type (/ 10 3.0) to continue.

- -

Type (/ 10 3.0) to continue.

diff --git a/resources/public/tutorial/page5.html b/resources/public/tutorial/page5.html index 5f40ebb..1788c09 100644 --- a/resources/public/tutorial/page5.html +++ b/resources/public/tutorial/page5.html @@ -1,11 +1,6 @@

Awesome!

- Another neat thing about Clojure is that functions can take an arbitrary number of arguments. - Functions are allowed to specify a 'catch-all' to put an optional and arbitrary number of arguments - into. Because of this, a lot of Clojure's core functions have interesting capabilities. For example - the arithmetic functions we've already played with are not limited to two arguments! No sir, they can - take any number of arguments they wish. + Many Clojure functions can take an arbitrary number of arguments. + Try it out: type (+ 1 2 3 4 5 6) to continue.

- -

Try it out. Type (+ 1 2 3 4 5 6) to continue.

diff --git a/resources/public/tutorial/page6.html b/resources/public/tutorial/page6.html index 0b55ee3..daa7698 100644 --- a/resources/public/tutorial/page6.html +++ b/resources/public/tutorial/page6.html @@ -1,7 +1,8 @@ -

Alright, that's enough math. Let's do some fun stuff, like write functions.

-

- You can define functions in Clojure with defn + That's enough math. Let's do some fun stuff, like defining functions. + You can do that in Clojure with defn.

-

Type (defn square [x] (* x x)) to continue!

+

+ Type (defn square [x] (* x x)) to define a "square" function that takes a single number and squares it. +

diff --git a/resources/public/tutorial/page7.html b/resources/public/tutorial/page7.html index cf0f574..e6c58c0 100644 --- a/resources/public/tutorial/page7.html +++ b/resources/public/tutorial/page7.html @@ -1,12 +1,13 @@ -

Oh boy! We wrote our very own function! It's a lovely one, isn't it?

+

Congratulations - you just defined your first Clojure function. Many more will follow!

- Our square function takes a single argument -- a number -- and squares it. + defn takes the name of the function, then the list of arguments, and then the body of the function. + I told you that a Clojure program is made of lists, right? + The entire defn is a list, and the function body is also a list. + (Even the arguments are collected in a vector, which is similar to a list - we'll talk about vectors soon).

- Take a look at how our defn form looks. First comes the name of the function, then the argument list - (which is a vector, and not an actual list), then the body of the function. + Oh, sorry for talking so long - you probably want to try out your brand new function! + Type (square 10).

- -

But wait! We don't even know if our function works or not! Let's try it out. Type (square 10).

diff --git a/resources/public/tutorial/page8.html b/resources/public/tutorial/page8.html index 075857f..878d1a4 100644 --- a/resources/public/tutorial/page8.html +++ b/resources/public/tutorial/page8.html @@ -1,17 +1,20 @@

Yay! It works!

- You know, Clojure is a functional programming language. As such, it has first-class and - anonymous functions. Let's write our square function as an anonymous function. + By now, you probably think that Clojure is very different from the programming languages you already know. + Indeed, it belongs to a different family than most popular languages' - the family of "functional" programming languages. + Like most functional languages, Clojure can define a function without even giving it a name:

+ (fn [x] (* x x)) +

- If you run this in the REPL above (as you should), you'll note that some very weird and - cryptic thing is printed. Functions are just normal values like a number, a string, or - anything else. The cryptic thing is simply how they look when printed. + If you run this code, you'll see some cryptic output. + In Clojures, functions are just normal values like numbers or strings. + fn defines a function and then returns it. + What you're seeing is simply what a function looks like when you print it on the screen.

- Our anonymous function isn't very useful if we don't call it. Let's do it. Type - ((fn [x] (* x x)) 10) + But wait - an anonymous function isn't very useful if you can't call it. Try to define a new anonymous function and call it straight away: ((fn [x] (* x x)) 10).

diff --git a/resources/public/tutorial/page9.html b/resources/public/tutorial/page9.html index d6e81da..8679f37 100644 --- a/resources/public/tutorial/page9.html +++ b/resources/public/tutorial/page9.html @@ -1,12 +1,16 @@

- Yay! Notice how we called our anonymous function? We just wrapped the function in parentheses, - placing it as the first element in this new list and passing it arguments just like we did earlier - with the arithmetic functions. Awesome, huh? + Let's see what you just did: you evaluated a list where the first element is the function itself, defined on the spot - and the other elements are the arguments that you pass to the function. + That's exactly the same syntax that you used earlier on to call functions like square or even +. + The only difference is that now you defined the function in the same place where you called it.

- You may not know this, but defn is actually just a bit of sugar around def - and fn to create named functions. We can create named functions without defn + Remember defn? + Now I can tell you a secret: defn is actually just a bit of syntactic sugar around def and fn. + You've just seen fn at work: it defines a new function. + def binds the newly defined function to a name.

-

Type (def square (fn [x] (* x x))) to continue.

+

+ If you want, you can create a named functions without using defn: type (def square (fn [x] (* x x))) to continue. +

diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 0efeebb..1c67091 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -15,34 +15,32 @@ (defpartial about-html [] [:p.bottom - "Please note that this REPL is sandboxed, so you wont be able to do everything in it " - "that you would in a local unsandboxed REPL. Keep in mind that this site is designed for " - "beginners to try out Clojure and not necessarily as a general-purpose server-side REPL."] + "Welcome to Try Clojure - a quick tour of Clojure for absolute beginners." + ] [:p.bottom - "One quirk you might run into is that things you bind with def can sometimes disappear. " - "The sandbox wipes defs if you def too many things, so don't be surprised. Furthermore, " - "The sandbox will automatically be wiped after 15 minutes and if you evaluate more after that," - "It'll be in an entirely new namespace/sandbox."] + "Here is our only disclaimer: this site is an introduction to Clojure, not a generic Clojure REPL. " + "You won't be able to do everything in it that you could do in your local interpreter. " + "Also, the interpreter deletes the data that you enter if you define too many things, or after 15 minutes."] [:p.bottom "You can find the site's source and such on its " (link-to "http://github.com/Raynes/tryclojure" "github") " page."] [:p.bottom - "TryClojure is written in Clojure and JavaScript (JQuery), powered by " - (link-to "https://github.com/flatland/clojail" "clojail") - " and Chris Done's " - (link-to "https://github.com/chrisdone/jquery-console" "jquery-console")] - [:p.bottom "Design by " (link-to "http://apgwoz.com" "Andrew Gwozdziewycz")]) + "TryClojure is written in Clojure and JavaScript with " + (link-to "http://webnoir.org" "Noir") ", " + (link-to "https://github.com/flatland/clojail" "clojail") ", and Chris Done's " + (link-to "https://github.com/chrisdone/jquery-console" "jquery-console") ". " + " The design is by " (link-to "http://apgwoz.com" "Andrew Gwozdziewycz") "." + ]) (defpartial home-html [] [:p.bottom - "Welcome to Try Clojure. See that little box up there? That's a Clojure repl. You can type " - "expressions and see their results right here in your browser. We also have a brief tutorial to " - "give you a taste of Clojure. Try it out by typing " [:code.expr "tutorial"] " in the console!"] - [:p.bottom - "Check out the site's source on " - (link-to "http://github.com/Raynes/tryclojure" "github") - "!"]) + "Welcome to Clojure! " + "You can see a Clojure interpreter above - we call it a REPL." + ] + [:p.bottom + "Type \"tutorial\" in the REPL to begin." + ]) (defn root-html [] (html5 @@ -67,11 +65,7 @@ [:a#about.buttons.last "about"]] [:div#changer (home-html)]] [:div.footer - [:p.bottom "©2011 Anthony Grimes and numerous contributors"] - [:p.bottom - "Built with " - (link-to "http://webnoir.org" "Noir") - "."]] + [:p.bottom "©2011-2012 Anthony Grimes and numerous contributors."]] (javascript-tag "var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-27340918-1']); From 7327047e7b8960b1ecce115eee05a9e260d00be3 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 18:57:42 +0100 Subject: [PATCH 20/44] fix typo in html tags (they're styled out anyway, but that may change) --- resources/public/tutorial/page10.html | 6 +++--- resources/public/tutorial/page3.html | 2 +- src/tryclojure/views/home.clj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/public/tutorial/page10.html b/resources/public/tutorial/page10.html index 5b43a30..f1e2228 100644 --- a/resources/public/tutorial/page10.html +++ b/resources/public/tutorial/page10.html @@ -17,11 +17,11 @@ Vectors and lists are sequential and ordered collections. Sets are not ordered, and they cannot contain duplicate elements. Maps are key-value collections, where the keys can be any object. - Here, we've used what Clojure calls a keyword (:foo) for one of the keys, and a number for the other key. + Here, we've used what Clojure calls a keyword (:foo) for one of the keys, and a number for the other key.

- Now I'll tell you another thing that may surprise you: Clojure collections are immutable - they can never change. + Now I'll tell you another thing that may surprise you: Clojure collections are immutable - they can never change. When you do anything on a list, including adding and removing elements, you actually get a brand new list. (Fortunately, Clojure is amazingly efficient at creating new lists). In general, Clojure encourages you to have as little mutable state as possible. @@ -29,7 +29,7 @@

- A prime example of this is map. map is a higher order function, which means that it takes another function as an argument. + A prime example of this is map. map is a higher order function, which means that it takes another function as an argument. For example, you can ask map to increment each number in a vector by passing it the inc function, followed by the vector. Try it for yourself: type (map inc [1 2 3 4]) to continue.

diff --git a/resources/public/tutorial/page3.html b/resources/public/tutorial/page3.html index 4edd21e..ae8cc9b 100644 --- a/resources/public/tutorial/page3.html +++ b/resources/public/tutorial/page3.html @@ -3,7 +3,7 @@

- A Clojure program is made of lists. + A Clojure program is made of lists. (+ 3 3) is a list that contains an operator, and then the operands. Try out the same concept with the * and - operators.

diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 1c67091..ad758dd 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -36,7 +36,7 @@ (defpartial home-html [] [:p.bottom "Welcome to Clojure! " - "You can see a Clojure interpreter above - we call it a REPL." + "You can see a Clojure interpreter above - we call it a REPL." ] [:p.bottom "Type \"tutorial\" in the REPL to begin." From 3815723323b56c3321dbaf9e2dd789b10c64f408 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 19:01:30 +0100 Subject: [PATCH 21/44] fix typo --- resources/public/tutorial/page8.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/public/tutorial/page8.html b/resources/public/tutorial/page8.html index 878d1a4..d3a26cf 100644 --- a/resources/public/tutorial/page8.html +++ b/resources/public/tutorial/page8.html @@ -10,7 +10,7 @@

If you run this code, you'll see some cryptic output. - In Clojures, functions are just normal values like numbers or strings. + In Clojure, functions are just normal values like numbers or strings. fn defines a function and then returns it. What you're seeing is simply what a function looks like when you print it on the screen.

From ded1e42964d8fd54d8f0ea89fee190d2b56ddb84 Mon Sep 17 00:00:00 2001 From: "Paolo \\\"Nusco\\\" Perrotta" Date: Sat, 24 Nov 2012 18:27:37 +0100 Subject: [PATCH 22/44] change text --- resources/public/javascript/tryclojure.js | 4 +-- resources/public/tutorial/page1.html | 12 ++----- resources/public/tutorial/page10.html | 35 +++++++++++--------- resources/public/tutorial/page11.html | 13 +++++--- resources/public/tutorial/page2.html | 7 ++-- resources/public/tutorial/page3.html | 13 ++++---- resources/public/tutorial/page4.html | 8 ++--- resources/public/tutorial/page5.html | 9 ++--- resources/public/tutorial/page6.html | 9 ++--- resources/public/tutorial/page7.html | 13 ++++---- resources/public/tutorial/page8.html | 17 ++++++---- resources/public/tutorial/page9.html | 16 +++++---- src/tryclojure/views/home.clj | 40 +++++++++++++---------- 13 files changed, 101 insertions(+), 95 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 4e04303..1e0256c 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -166,8 +166,8 @@ var controller; $(document).ready(function() { controller = $("#console").console({ - welcomeMessage:'Enter some Clojure code to be evaluated.', - promptLabel: 'Clojure> ', + welcomeMessage:'Give me some Clojure:', + promptLabel: '> ', commandValidate: onValidate, commandHandle: onHandle, autofocus:true, diff --git a/resources/public/tutorial/page1.html b/resources/public/tutorial/page1.html index 7ffd325..4654fcb 100644 --- a/resources/public/tutorial/page1.html +++ b/resources/public/tutorial/page1.html @@ -1,15 +1,7 @@

- This tutorial isn't entirely complete yet. More fun content is to be written. Stay tuned. + I'll take you on a 5-minutes tour of Clojure, but feel free to experiment on your own along the road!

- Above, you have your REPL. Please try the examples as we go along, and by all means experiment - with concepts independently. Should you refuse, you will promptly be IP banned from this - website, and a teddy bear will eat your candies. ctrl+v to paste and ctrl+c to copy like you - would normally expect, but you can't paste with your browser's right-click menu. -

- -

- You can type 'next' to move forward, 'back' to go back to the previous step, and 'restart' to - restart the tutorial. Go ahead and type 'next' to begin + You can type next to skip forward, back to return to the previous step, and restart to get back to the beginning. Let's get started: type next.

diff --git a/resources/public/tutorial/page10.html b/resources/public/tutorial/page10.html index f19c97b..5b43a30 100644 --- a/resources/public/tutorial/page10.html +++ b/resources/public/tutorial/page10.html @@ -1,30 +1,35 @@ -

Awesome. Now you can call this function just like we called the old square function.

+

+ Success! Now you can call this new square function just like you called the old square function. +

- Clojure has a great set of immutable and persistent data structures. Vectors, lists, maps, sets, - I get chills. + By now, you know that lists are quite important in Clojure. + But Clojure also has other data structures:

Vectors: [1 2 3 4]
Maps: {:foo "bar" 3 4}
- Lists: '(1 2 3 4)
Sets: #{1 2 3 4}
- Vectors and lists are sequential and ordered collections. You'll see vectors used much more than lists. - Maps are typical hash-maps - unordered collections indexed by keys. The keys can be any object. Here, - we've used a keyword, :foo as a key. Keywords make excellent keys. We also used a number. - Sets are mathematical sets.

- Clojure's collections are one of the most imporant parts of Clojure. Being a functional language, Clojure - encourages immutability and as little state as possible. Therefore, instead of for loops mutating variables - and such, most of the time you'll see higher order functions doing transformations on immutable data and - returning new collections rather than ever modifying the old one. + Vectors and lists are sequential and ordered collections. + Sets are not ordered, and they cannot contain duplicate elements. + Maps are key-value collections, where the keys can be any object. + Here, we've used what Clojure calls a keyword (:foo) for one of the keys, and a number for the other key. +

+ +

+ Now I'll tell you another thing that may surprise you: Clojure collections are immutable - they can never change. + When you do anything on a list, including adding and removing elements, you actually get a brand new list. + (Fortunately, Clojure is amazingly efficient at creating new lists). + In general, Clojure encourages you to have as little mutable state as possible. + For example, instead of "for" loops and other state-changing constructs, most of the time you'll see functions doing transformations on immutable data and returning new collections, without changing the old one.

- A prime example of this is map. We can use map, a higher order function (which is a function - that takes functions as arguments or returns functions), to 'map' a function to every element of a sequence. - Let's use this to increment each number in a vector. Type (map inc [1 2 3 4]) to continue. + A prime example of this is map. map is a higher order function, which means that it takes another function as an argument. + For example, you can ask map to increment each number in a vector by passing it the inc function, followed by the vector. + Try it for yourself: type (map inc [1 2 3 4]) to continue.

diff --git a/resources/public/tutorial/page11.html b/resources/public/tutorial/page11.html index da67d0a..726fe3c 100644 --- a/resources/public/tutorial/page11.html +++ b/resources/public/tutorial/page11.html @@ -1,8 +1,11 @@ -

Excellent work.

+

Great job!

- Well, that's all there is right now. This tutorial is still a work in progress, and I'm working on more - steps. If anybody wants to contribute, you can find a link to the Github repository on the 'about' page. - Furthermore, if you're just a brand new Clojure developer looking for some learning experiences, check - out the 'links' page. You'll find links to some tutorials and such there. + We've only scratched the surface of Clojure and its mind-bending power. + This tutorial is still a work in progress, and I'm working on more steps. + Meanwhile, you can learn more about Clojure by visiting the 'links' page. +

+ +

+ Welcome to your adventures in Clojure, and be prepared to be surprised and delighted every step of the way!

diff --git a/resources/public/tutorial/page2.html b/resources/public/tutorial/page2.html index acd317f..1d11c62 100644 --- a/resources/public/tutorial/page2.html +++ b/resources/public/tutorial/page2.html @@ -1,6 +1,7 @@

- I bet you're curious to find out what Clojure code looks like, aren't you? Sure you are. - Well, I've give you a hint: it's made up of lists. Let's do some arithmetic. + The first thing you may notice about Clojure is that common operations look... strange.

-(+ 3 3) +

+ For example, try typing (+ 3 3) in the REPL. +

diff --git a/resources/public/tutorial/page3.html b/resources/public/tutorial/page3.html index 925f30e..4edd21e 100644 --- a/resources/public/tutorial/page3.html +++ b/resources/public/tutorial/page3.html @@ -1,12 +1,13 @@

- Excellent work! There are other arithmetic functions. + That was a strange way to say "three plus three", wasn't it?

-* -- -/

- Try them out. Save / for last (don't worry, I have a reason!). + A Clojure program is made of lists. + (+ 3 3) is a list that contains an operator, and then the operands. + Try out the same concept with the * and - operators.

-

Once you're finished playing around, try (/ 10 3).

+

+ Division might surprise you. When you're ready to move forward, try (/ 10 3). +

diff --git a/resources/public/tutorial/page4.html b/resources/public/tutorial/page4.html index 0d06d50..991dc20 100644 --- a/resources/public/tutorial/page4.html +++ b/resources/public/tutorial/page4.html @@ -1,8 +1,4 @@

- I bet that caught you by surprise, didn't it? Don't fear! Clojure simply has a built in Rational type. - We can prove that we've got a rational by running (type (/ 10 3)). Rationals are more - concise and precise than floating point numbers. However, we can force Clojure to do floating point - division by just making one of our numbers floating point. + Now, that was a bit surprising: Clojure has a built in Rational type. + You can still force Clojure to do floating point division by making one of the operands floating point: type (/ 10 3.0) to continue.

- -

Type (/ 10 3.0) to continue.

diff --git a/resources/public/tutorial/page5.html b/resources/public/tutorial/page5.html index 5f40ebb..1788c09 100644 --- a/resources/public/tutorial/page5.html +++ b/resources/public/tutorial/page5.html @@ -1,11 +1,6 @@

Awesome!

- Another neat thing about Clojure is that functions can take an arbitrary number of arguments. - Functions are allowed to specify a 'catch-all' to put an optional and arbitrary number of arguments - into. Because of this, a lot of Clojure's core functions have interesting capabilities. For example - the arithmetic functions we've already played with are not limited to two arguments! No sir, they can - take any number of arguments they wish. + Many Clojure functions can take an arbitrary number of arguments. + Try it out: type (+ 1 2 3 4 5 6) to continue.

- -

Try it out. Type (+ 1 2 3 4 5 6) to continue.

diff --git a/resources/public/tutorial/page6.html b/resources/public/tutorial/page6.html index 0b55ee3..daa7698 100644 --- a/resources/public/tutorial/page6.html +++ b/resources/public/tutorial/page6.html @@ -1,7 +1,8 @@ -

Alright, that's enough math. Let's do some fun stuff, like write functions.

-

- You can define functions in Clojure with defn + That's enough math. Let's do some fun stuff, like defining functions. + You can do that in Clojure with defn.

-

Type (defn square [x] (* x x)) to continue!

+

+ Type (defn square [x] (* x x)) to define a "square" function that takes a single number and squares it. +

diff --git a/resources/public/tutorial/page7.html b/resources/public/tutorial/page7.html index cf0f574..e6c58c0 100644 --- a/resources/public/tutorial/page7.html +++ b/resources/public/tutorial/page7.html @@ -1,12 +1,13 @@ -

Oh boy! We wrote our very own function! It's a lovely one, isn't it?

+

Congratulations - you just defined your first Clojure function. Many more will follow!

- Our square function takes a single argument -- a number -- and squares it. + defn takes the name of the function, then the list of arguments, and then the body of the function. + I told you that a Clojure program is made of lists, right? + The entire defn is a list, and the function body is also a list. + (Even the arguments are collected in a vector, which is similar to a list - we'll talk about vectors soon).

- Take a look at how our defn form looks. First comes the name of the function, then the argument list - (which is a vector, and not an actual list), then the body of the function. + Oh, sorry for talking so long - you probably want to try out your brand new function! + Type (square 10).

- -

But wait! We don't even know if our function works or not! Let's try it out. Type (square 10).

diff --git a/resources/public/tutorial/page8.html b/resources/public/tutorial/page8.html index 075857f..878d1a4 100644 --- a/resources/public/tutorial/page8.html +++ b/resources/public/tutorial/page8.html @@ -1,17 +1,20 @@

Yay! It works!

- You know, Clojure is a functional programming language. As such, it has first-class and - anonymous functions. Let's write our square function as an anonymous function. + By now, you probably think that Clojure is very different from the programming languages you already know. + Indeed, it belongs to a different family than most popular languages' - the family of "functional" programming languages. + Like most functional languages, Clojure can define a function without even giving it a name:

+ (fn [x] (* x x)) +

- If you run this in the REPL above (as you should), you'll note that some very weird and - cryptic thing is printed. Functions are just normal values like a number, a string, or - anything else. The cryptic thing is simply how they look when printed. + If you run this code, you'll see some cryptic output. + In Clojures, functions are just normal values like numbers or strings. + fn defines a function and then returns it. + What you're seeing is simply what a function looks like when you print it on the screen.

- Our anonymous function isn't very useful if we don't call it. Let's do it. Type - ((fn [x] (* x x)) 10) + But wait - an anonymous function isn't very useful if you can't call it. Try to define a new anonymous function and call it straight away: ((fn [x] (* x x)) 10).

diff --git a/resources/public/tutorial/page9.html b/resources/public/tutorial/page9.html index d6e81da..8679f37 100644 --- a/resources/public/tutorial/page9.html +++ b/resources/public/tutorial/page9.html @@ -1,12 +1,16 @@

- Yay! Notice how we called our anonymous function? We just wrapped the function in parentheses, - placing it as the first element in this new list and passing it arguments just like we did earlier - with the arithmetic functions. Awesome, huh? + Let's see what you just did: you evaluated a list where the first element is the function itself, defined on the spot - and the other elements are the arguments that you pass to the function. + That's exactly the same syntax that you used earlier on to call functions like square or even +. + The only difference is that now you defined the function in the same place where you called it.

- You may not know this, but defn is actually just a bit of sugar around def - and fn to create named functions. We can create named functions without defn + Remember defn? + Now I can tell you a secret: defn is actually just a bit of syntactic sugar around def and fn. + You've just seen fn at work: it defines a new function. + def binds the newly defined function to a name.

-

Type (def square (fn [x] (* x x))) to continue.

+

+ If you want, you can create a named functions without using defn: type (def square (fn [x] (* x x))) to continue. +

diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 0f2b03b..36701c2 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -15,26 +15,32 @@ (defpartial about-html [] [:p.bottom - "Please note that this REPL is sandboxed, so you wont be able to do everything in it " - "that you would in a local unsandboxed REPL. Keep in mind that this site is designed for " - "beginners to try out Clojure and not necessarily as a general-purpose server-side REPL."] + "Welcome to Try Clojure - a quick tour of Clojure for absolute beginners." + ] [:p.bottom - "One quirk you might run into is that things you bind with def can sometimes disappear. " - "The sandbox wipes defs if you def too many things, so don't be surprised. Furthermore, " - "The sandbox will automatically be wiped after 15 minutes and if you evaluate more after that," - "It'll be in an entirely new namespace/sandbox."] + "Here is our only disclaimer: this site is an introduction to Clojure, not a generic Clojure REPL. " + "You won't be able to do everything in it that you could do in your local interpreter. " + "Also, the interpreter deletes the data that you enter if you define too many things, or after 15 minutes."] [:p.bottom - "TryClojure is written in Clojure and JavaScript (JQuery), powered by " - (link-to "https://github.com/flatland/clojail" "clojail") - " and Chris Done's " - (link-to "https://github.com/chrisdone/jquery-console" "jquery-console")] - [:p.bottom "Design by " (link-to "http://apgwoz.com" "Andrew Gwozdziewycz")]) + "You can find the site's source and such on its " + (link-to "http://github.com/Raynes/tryclojure" "github") + " page."] + [:p.bottom + "TryClojure is written in Clojure and JavaScript with " + (link-to "http://webnoir.org" "Noir") ", " + (link-to "https://github.com/flatland/clojail" "clojail") ", and Chris Done's " + (link-to "https://github.com/chrisdone/jquery-console" "jquery-console") ". " + " The design is by " (link-to "http://apgwoz.com" "Andrew Gwozdziewycz") "." + ]) (defpartial home-html [] [:p.bottom - "Welcome to Try Clojure. See that little box up there? That's a Clojure repl. You can type " - "expressions and see their results right here in your browser. We also have a brief tutorial to " - "give you a taste of Clojure. Try it out by typing " [:code.expr "tutorial"] " in the console!"]) + "Welcome to Clojure! " + "You can see a Clojure interpreter above - we call it a REPL." + ] + [:p.bottom + "Type \"tutorial\" in the REPL to begin." + ]) (defn root-html [] (html5 @@ -65,9 +71,7 @@ [:a#about.buttons.last "about"]] [:div#changer (home-html)]] [:div.footer - [:p.bottom "©2011-2012 Anthony Grimes and numerous contributors. Built with " - (link-to "http://webnoir.org" "Noir") - "."]] + [:p.bottom "©2011-2012 Anthony Grimes and numerous contributors."]] (javascript-tag "var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-27340918-1']); From 9a4a1dc28c44f46504707504e71dcdc1e1c60e8d Mon Sep 17 00:00:00 2001 From: "Paolo \\\"Nusco\\\" Perrotta" Date: Sat, 24 Nov 2012 18:57:42 +0100 Subject: [PATCH 23/44] fix typo in html tags (they're styled out anyway, but that may change) --- resources/public/tutorial/page10.html | 6 +++--- resources/public/tutorial/page3.html | 2 +- src/tryclojure/views/home.clj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/public/tutorial/page10.html b/resources/public/tutorial/page10.html index 5b43a30..f1e2228 100644 --- a/resources/public/tutorial/page10.html +++ b/resources/public/tutorial/page10.html @@ -17,11 +17,11 @@ Vectors and lists are sequential and ordered collections. Sets are not ordered, and they cannot contain duplicate elements. Maps are key-value collections, where the keys can be any object. - Here, we've used what Clojure calls a keyword (:foo) for one of the keys, and a number for the other key. + Here, we've used what Clojure calls a keyword (:foo) for one of the keys, and a number for the other key.

- Now I'll tell you another thing that may surprise you: Clojure collections are immutable - they can never change. + Now I'll tell you another thing that may surprise you: Clojure collections are immutable - they can never change. When you do anything on a list, including adding and removing elements, you actually get a brand new list. (Fortunately, Clojure is amazingly efficient at creating new lists). In general, Clojure encourages you to have as little mutable state as possible. @@ -29,7 +29,7 @@

- A prime example of this is map. map is a higher order function, which means that it takes another function as an argument. + A prime example of this is map. map is a higher order function, which means that it takes another function as an argument. For example, you can ask map to increment each number in a vector by passing it the inc function, followed by the vector. Try it for yourself: type (map inc [1 2 3 4]) to continue.

diff --git a/resources/public/tutorial/page3.html b/resources/public/tutorial/page3.html index 4edd21e..ae8cc9b 100644 --- a/resources/public/tutorial/page3.html +++ b/resources/public/tutorial/page3.html @@ -3,7 +3,7 @@

- A Clojure program is made of lists. + A Clojure program is made of lists. (+ 3 3) is a list that contains an operator, and then the operands. Try out the same concept with the * and - operators.

diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 36701c2..2a1c4af 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -36,7 +36,7 @@ (defpartial home-html [] [:p.bottom "Welcome to Clojure! " - "You can see a Clojure interpreter above - we call it a REPL." + "You can see a Clojure interpreter above - we call it a REPL." ] [:p.bottom "Type \"tutorial\" in the REPL to begin." From 37a5dbd2a2bd0cc011605ce0bd8ea5b5feff60ab Mon Sep 17 00:00:00 2001 From: "Paolo \\\"Nusco\\\" Perrotta" Date: Sat, 24 Nov 2012 19:01:30 +0100 Subject: [PATCH 24/44] fix typo --- resources/public/tutorial/page8.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/public/tutorial/page8.html b/resources/public/tutorial/page8.html index 878d1a4..d3a26cf 100644 --- a/resources/public/tutorial/page8.html +++ b/resources/public/tutorial/page8.html @@ -10,7 +10,7 @@

If you run this code, you'll see some cryptic output. - In Clojures, functions are just normal values like numbers or strings. + In Clojure, functions are just normal values like numbers or strings. fn defines a function and then returns it. What you're seeing is simply what a function looks like when you print it on the screen.

From 8bf5ac3fab676b3f23a144e7e70c9190528a281e Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sat, 24 Nov 2012 19:47:29 +0100 Subject: [PATCH 25/44] refactor page resolution to allow arbitrary page numbers --- resources/public/javascript/tryclojure.js | 38 ++++++++++++++--------- src/tryclojure/views/tutorial.clj | 4 +-- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 1e0256c..32b64ec 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -1,5 +1,17 @@ -var pageNum = -1; -var page = null; +var currentPage = -1; +var pageNames = [ + "page1", + "page2", + "page3", + "page4", + "page5", + "page6", + "page7", + "page8", + "page9", + "page10", + "page11" + ]; var pages = [ { verify: function(data) { return false; } @@ -37,14 +49,12 @@ var pages = [ ]; function showPage(n) { - var res = pages[n]; - if (res) { - pageNum = n; - page = res; + if (pages[n]) { + currentPage = n; var block = $("#changer"); block.fadeOut(function(e) { - block.load("/tutorial", { 'n' : n+1 }, function() { + block.load("/tutorial", { 'page' : pageNames[n+1] }, function() { block.fadeIn(); changerUpdated(); }); @@ -92,23 +102,23 @@ function doCommand(input, report) { report(); return true; case 'back': - if (pageNum > 0) { - showPage(pageNum - 1); + if (currentPage > 0) { + showPage(currentPage - 1); report(); return true; } else { return false; } case 'next': - if (pageNum >= 0 && pageNum < pages.length - 1) { - showPage(pageNum + 1); + if (currentPage >= 0 && currentPage < pages.length - 1) { + showPage(currentPage + 1); report(); return true; } else { return false; } case 'restart': - if (pageNum > 0) { + if (currentPage > 0) { showPage(0); report(); return true; @@ -139,8 +149,8 @@ function onHandle(line, report) { } // handle page - if (page && page.verify(data)) { - showPage(pageNum + 1); + if (pages[n] && pages[n].verify(data)) { + showPage(currentPage + 1); } // display expr results diff --git a/src/tryclojure/views/tutorial.clj b/src/tryclojure/views/tutorial.clj index f7ee2b2..550ab54 100644 --- a/src/tryclojure/views/tutorial.clj +++ b/src/tryclojure/views/tutorial.clj @@ -1,5 +1,5 @@ (ns tryclojure.views.tutorial (:require [noir.core :refer [defpage]])) -(defpage [:post "/tutorial"] {n :n} - (slurp (str "resources/public/tutorial/page" n ".html"))) \ No newline at end of file +(defpage [:post "/tutorial"] {page :page} + (slurp (str "resources/public/tutorial/" page ".html"))) \ No newline at end of file From a7e3cc81c5a34de5a5b199f4f0304792ed1db22a Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 01:11:21 +0100 Subject: [PATCH 26/44] fix problems in screen flow --- resources/public/javascript/tryclojure.js | 88 +++++++++++------------ src/tryclojure/views/home.clj | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 32b64ec..36162cd 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -1,5 +1,5 @@ var currentPage = -1; -var pageNames = [ +var pages = [ "page1", "page2", "page3", @@ -12,7 +12,7 @@ var pageNames = [ "page10", "page11" ]; -var pages = [ +var pageExitConditions = [ { verify: function(data) { return false; } }, @@ -48,18 +48,34 @@ var pages = [ } ]; -function showPage(n) { - if (pages[n]) { - currentPage = n; +function nextPage() { + if (currentPage < pages.length - 1) { + goToPage(currentPage + 1); + } +} - var block = $("#changer"); - block.fadeOut(function(e) { - block.load("/tutorial", { 'page' : pageNames[n+1] }, function() { - block.fadeIn(); - changerUpdated(); - }); - }); - } +function previousPage() { + if (currentPage > 0) { + goToPage(currentPage - 1); + } +} + +function goToFirstPage() { + if (currentPage > 0) { + goToPage(0); + } +} + +function goToPage(pageNumber) { + currentPage = pageNumber; + + var block = $("#changer"); + block.fadeOut(function(e) { + block.load("/tutorial", { 'page' : pages[pageNumber] }, function() { + block.fadeIn(); + changerUpdated(); + }); + }); } function setupLink(url) { @@ -95,36 +111,17 @@ function html_escape(val) { return result; } -function doCommand(input, report) { - switch (input) { - case 'tutorial': - showPage(0); - report(); - return true; +function doCommand(input) { + switch (input) { + case 'next': + nextPage(); + return true; case 'back': - if (currentPage > 0) { - showPage(currentPage - 1); - report(); - return true; - } else { - return false; - } - case 'next': - if (currentPage >= 0 && currentPage < pages.length - 1) { - showPage(currentPage + 1); - report(); - return true; - } else { - return false; - } + previousPage(); + return true; case 'restart': - if (currentPage > 0) { - showPage(0); - report(); - return true; - } else { - return false; - } + goToFirstPage(); + return true; default: return false; } @@ -138,7 +135,10 @@ function onHandle(line, report) { var input = $.trim(line); // handle commands - if (doCommand(input, report)) return; + if (doCommand(input)) { + report(); + return; + } // perform evaluation var data = eval_clojure(input); @@ -149,8 +149,8 @@ function onHandle(line, report) { } // handle page - if (pages[n] && pages[n].verify(data)) { - showPage(currentPage + 1); + if (currentPage >= 0 && pageExitConditions[currentPage].verify(data)) { + nextPage(); } // display expr results diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 54909be..a3fbbda 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -35,7 +35,7 @@ "You can see a Clojure interpreter above - we call it a REPL." ] [:p.bottom - "Type \"tutorial\" in the REPL to begin." + "Type \"next\" in the REPL to begin." ]) (defn root-html [] From 9ebd2ed74b1c4e5ccf88eadbd98533286fc9535f Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 02:19:07 +0100 Subject: [PATCH 27/44] add a few command alias (Like 'previous' for back and 'reset' for 'restart'.) I tended to forget the commands the first time I was using TryClojure. These aliases should help users as absent-minded as I am. --- resources/public/javascript/tryclojure.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 36162cd..4e26625 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -113,13 +113,19 @@ function html_escape(val) { function doCommand(input) { switch (input) { - case 'next': + case 'next': + case 'forward': nextPage(); return true; - case 'back': + case 'previous': + case 'prev': + case 'back': previousPage(); return true; case 'restart': + case 'reset': + case 'home': + case 'quit': goToFirstPage(); return true; default: From e1f13feec4247c7360f6aca8863c5f9419c4b94e Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 02:20:43 +0100 Subject: [PATCH 28/44] refactorings --- resources/public/javascript/tryclojure.js | 28 ++++++----------------- src/tryclojure/views/home.clj | 6 ++--- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 4e26625..19e60bd 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -48,25 +48,11 @@ var pageExitConditions = [ } ]; -function nextPage() { - if (currentPage < pages.length - 1) { - goToPage(currentPage + 1); - } -} - -function previousPage() { - if (currentPage > 0) { - goToPage(currentPage - 1); - } -} - -function goToFirstPage() { - if (currentPage > 0) { - goToPage(0); - } -} - function goToPage(pageNumber) { + if (pageNumber == currentPage || pageNumber < 0 || pageNumber >= pages.length) { + return; + } + currentPage = pageNumber; var block = $("#changer"); @@ -115,18 +101,18 @@ function doCommand(input) { switch (input) { case 'next': case 'forward': - nextPage(); + goToPage(currentPage + 1); return true; case 'previous': case 'prev': case 'back': - previousPage(); + goToPage(currentPage - 1); return true; case 'restart': case 'reset': case 'home': case 'quit': - goToFirstPage(); + goToPage(0); return true; default: return false; diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index a3fbbda..593c49b 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -3,7 +3,7 @@ [hiccup.element :refer [javascript-tag link-to unordered-list]] [hiccup.page :refer [include-css include-js html5]])) -(defpartial links [] +(defpartial links-html [] (unordered-list [(link-to "http://clojure.org" "The official Clojure website") (link-to "http://dev.clojure.org/display/doc/Getting+Started" "Getting started with Clojure") @@ -35,7 +35,7 @@ "You can see a Clojure interpreter above - we call it a REPL." ] [:p.bottom - "Type \"next\" in the REPL to begin." + "Type next in the REPL to begin." ]) (defn root-html [] @@ -89,4 +89,4 @@ (about-html)) (defpage "/links" [] - (links)) + (links-html)) From b398f7b5031bc35ca734b5ce125bd4004ee5c2c4 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 02:37:42 +0100 Subject: [PATCH 29/44] add a final page In case people type 'next' on the last tutorial page --- resources/public/javascript/tryclojure.js | 6 +++++- resources/public/tutorial/end.html | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 resources/public/tutorial/end.html diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index 19e60bd..fc2977b 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -10,7 +10,8 @@ var pages = [ "page8", "page9", "page10", - "page11" + "page11", + "end" ]; var pageExitConditions = [ { @@ -43,6 +44,9 @@ var pageExitConditions = [ { verify: function (data) { return data.expr == "(map inc [1 2 3 4])"; } }, + { + verify: function (data) { return false; } + }, { verify: function (data) { return false; } } diff --git a/resources/public/tutorial/end.html b/resources/public/tutorial/end.html new file mode 100644 index 0000000..fe64621 --- /dev/null +++ b/resources/public/tutorial/end.html @@ -0,0 +1,7 @@ +

+ Glad to know you're eager for more, but unfortunately this tutorial is over. +

+ +

+ Maybe you can click the 'links' button above for more resources?. +

From d2b277c4ac1fa0e563162a3bd6d3f42dbedbc9dc Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 02:51:51 +0100 Subject: [PATCH 30/44] remove 'home' button' It broke 'next' and 'back' If someone wants to go back to the beginning, she can either use 'restart' or just refresh the URL. --- src/tryclojure/views/home.clj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 593c49b..856451f 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -62,7 +62,6 @@ [:div#container [:div#console.console] [:div#buttons - [:a#home.buttons "home"] [:a#links.buttons "links"] [:a#about.buttons.last "about"]] [:div#changer (home-html)]] From 473e8e1296bf3d35253f0e61561734e8b9c64ff7 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 03:08:33 +0100 Subject: [PATCH 31/44] add undocumented 'gopage x' command (useful for debugging) --- resources/public/javascript/tryclojure.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/public/javascript/tryclojure.js b/resources/public/javascript/tryclojure.js index fc2977b..c6069fc 100644 --- a/resources/public/javascript/tryclojure.js +++ b/resources/public/javascript/tryclojure.js @@ -54,7 +54,7 @@ var pageExitConditions = [ function goToPage(pageNumber) { if (pageNumber == currentPage || pageNumber < 0 || pageNumber >= pages.length) { - return; + return; } currentPage = pageNumber; @@ -102,6 +102,11 @@ function html_escape(val) { } function doCommand(input) { + if (input.match(/^gopage /)) { + goToPage(parseInt(input.substring("gopage ".length))); + return true; + } + switch (input) { case 'next': case 'forward': @@ -146,7 +151,7 @@ function onHandle(line, report) { // handle page if (currentPage >= 0 && pageExitConditions[currentPage].verify(data)) { - nextPage(); + goToPage(currentPage + 1); } // display expr results From 4608432aecd0fd52106e8cfc3b581145729b5aa5 Mon Sep 17 00:00:00 2001 From: "Paolo \"Nusco\" Perrotta" Date: Sun, 25 Nov 2012 12:26:08 +0100 Subject: [PATCH 32/44] fix typo --- resources/public/tutorial/end.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/public/tutorial/end.html b/resources/public/tutorial/end.html index fe64621..f85f040 100644 --- a/resources/public/tutorial/end.html +++ b/resources/public/tutorial/end.html @@ -3,5 +3,5 @@

- Maybe you can click the 'links' button above for more resources?. + Maybe you can click the 'links' button above for more resources?

From 098dbb9381a3db79d1e2d32895bccef4e6f11525 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 15 Mar 2013 22:18:54 +0400 Subject: [PATCH 33/44] Link to clojure-doc.org --- src/tryclojure/views/home.clj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tryclojure/views/home.clj b/src/tryclojure/views/home.clj index 856451f..0bbc4d4 100644 --- a/src/tryclojure/views/home.clj +++ b/src/tryclojure/views/home.clj @@ -6,9 +6,8 @@ (defpartial links-html [] (unordered-list [(link-to "http://clojure.org" "The official Clojure website") - (link-to "http://dev.clojure.org/display/doc/Getting+Started" "Getting started with Clojure") + (link-to "http://clojure-doc.org/" "Clojure tutorials and documentation") (link-to "http://groups.google.com/group/clojure" "Clojure mailing list") - (link-to "http://java.ociweb.com/mark/clojure/article.html" "A comprehensive Clojure tutorial") (link-to "http://joyofclojure.com/" "The Joy of Clojure: a book by Michael Fogus and Chris Houser") (link-to "http://disclojure.org" "Disclojure") (link-to "http://planet.clojure.in" "Planet Clojure")])) From bb93101ca4f5f3249d7f351b39938c55f818bccf Mon Sep 17 00:00:00 2001 From: Anthony Grimes Date: Tue, 12 Mar 2013 22:07:06 -0700 Subject: [PATCH 34/44] Update clojail. --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 81f6fb5..6a91931 100644 --- a/project.clj +++ b/project.clj @@ -3,6 +3,6 @@ :dependencies [[org.clojure/clojure "1.4.0"] [noir "1.3.0-beta10"] [commons-lang/commons-lang "2.5"] - [clojail "1.0.1"]] + [clojail "1.0.6"]] :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] :main tryclojure.server) From 4ecf3727bdb5aa790de00dc298ba9b14d5cf2257 Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Mon, 1 Jul 2013 16:24:53 -0700 Subject: [PATCH 35/44] Generate an uberjar during deployment. --- Procfile | 2 +- README.md | 2 +- project.clj | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Procfile b/Procfile index 09a6c19..c4d5a3c 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: lein run +web: java $JVM_OPTS -cp target/tryclojure-standalone.jar clojure.main -m tryclojure.server diff --git a/README.md b/README.md index c7be349..3ec9350 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ TryClojure is a online Clojure REPL written using Noir and Chris Done's jquery c http://tryclj.com -If you want to run it, refer to https://github.com/Raynes/tryclojure/wiki/Running-Tryclojure +To run it locally, use `lein run`. ## Credits diff --git a/project.clj b/project.clj index 6a91931..a49a54c 100644 --- a/project.clj +++ b/project.clj @@ -4,5 +4,7 @@ [noir "1.3.0-beta10"] [commons-lang/commons-lang "2.5"] [clojail "1.0.6"]] - :jvm-opts ["-Djava.security.policy=example.policy""-Xmx80M"] + :jvm-opts ["-Djava.security.policy=example.policy" "-Xmx80M"] + :min-lein-version "2.0.0" + :uberjar-name "tryclojure-standalone.jar" :main tryclojure.server) From afa0845bb99ff027b7369654f3106453c691e33e Mon Sep 17 00:00:00 2001 From: Phil Hagelberg Date: Mon, 1 Jul 2013 16:43:43 -0700 Subject: [PATCH 36/44] Move security policy setting into Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index c4d5a3c..c39b2ec 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JVM_OPTS -cp target/tryclojure-standalone.jar clojure.main -m tryclojure.server +web: java -Djava.security.policy=example.policy $JVM_OPTS -cp target/tryclojure-standalone.jar clojure.main -m tryclojure.server From 7a6bf2b9a576e723843588cac366c08abd35134c Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 19 Mar 2014 11:53:42 -0400 Subject: [PATCH 37/44] Updated to latest version of jquery-console. --- .../public/javascript/jquery-console/README | 15 +- .../javascript/jquery-console/demo.html | 27 + .../jquery-console/jquery.console.js | 1308 +++++++++-------- 3 files changed, 746 insertions(+), 604 deletions(-) diff --git a/resources/public/javascript/jquery-console/README b/resources/public/javascript/jquery-console/README index 245420f..c5d2de3 100644 --- a/resources/public/javascript/jquery-console/README +++ b/resources/public/javascript/jquery-console/README @@ -1,6 +1,6 @@ INTRODUCTION -See demo.html. Or here: http://chrisdone.com/jquery-console/demo.html +See demo.html. Or here: http://chrisdone.com/jquery-console/ Options available: @@ -18,6 +18,10 @@ Options available: promptLabel string Prompt string like 'JavaScript> '. + cols integer the number of cols, this value is only + used by the command completion to format + the list of results. + commandValidate function When user hits return, validate whether to trigger commandHandle and re-prompt. @@ -30,6 +34,10 @@ Options available: to report a result of the command asynchronously. + commandComplete function Handle the command completion when the + tab key is pressed. It returns a list + of string completion suffixes. + animateScroll bool Whether to animate the scroll to top. Currently disabled. @@ -39,6 +47,9 @@ Options available: cancelHandle function Handle a user-signaled interrupt. + fadeOnReset bool Whether to trigger a fade in/out when + the console is reset. Defaults to true. + LICENSE Copyright 2010 Chris Done, Simon David Pratt. All rights reserved. @@ -68,5 +79,3 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - diff --git a/resources/public/javascript/jquery-console/demo.html b/resources/public/javascript/jquery-console/demo.html index 370ca73..7f85186 100644 --- a/resources/public/javascript/jquery-console/demo.html +++ b/resources/public/javascript/jquery-console/demo.html @@ -102,6 +102,33 @@ }, promptHistory:true }); + /* Fifth console */ + var console5 = $('
'); + $('body').append(console5); + var controller5 = console5.console({ + promptLabel: 'Complete> ', + commandHandle:function(line){ + if (line) { + return [{msg:"you typed " + line,className:"jquery-console-message-value"}]; + } else { + var m = "type a color among (" + this.colors.join(", ") + ")"; + return [{msg:m,className:"jquery-console-message-value"}]; + } + }, + colors: ["red","blue","green","black","yellow","white","grey"], + cols: 40, + completeHandle:function(prefix){ + var colors = this.colors; + var ret = []; + for (var i=0;i