summaryrefslogtreecommitdiff
path: root/share/www
diff options
context:
space:
mode:
authorChristopher Lenz <cmlenz@apache.org>2009-01-15 08:53:25 +0000
committerChristopher Lenz <cmlenz@apache.org>2009-01-15 08:53:25 +0000
commitf815fc6cca11d6119a5cb788821957cdcba1a567 (patch)
treeb353e75d217ceac1b24db1856b456a53bbb82e0b /share/www
parent28b6fb6dfbce96e6992591a1287bdf39c735f414 (diff)
Fix bug in test runner triggered by upgrade to jQuery 1.3.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@734633 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www')
-rw-r--r--share/www/script/couch_test_runner.js4
-rw-r--r--share/www/script/futon.browse.js10
-rw-r--r--share/www/style/layout.css8
3 files changed, 19 insertions, 3 deletions
diff --git a/share/www/script/couch_test_runner.js b/share/www/script/couch_test_runner.js
index 921b9371..a454a835 100644
--- a/share/www/script/couch_test_runner.js
+++ b/share/www/script/couch_test_runner.js
@@ -137,7 +137,9 @@ function updateTestsListing() {
function updateTestsFooter() {
var tests = $("#tests tbody.content tr td.status");
- var testsRun = tests.not(":contains('not run'))");
+ console.log(tests);
+ var testsRun = tests.filter(".success, .error, .failure");
+ console.log(testsRun)
var testsFailed = testsRun.not(".success");
$("#tests tbody.footer td").text(testsRun.length + " of " + tests.length +
" test(s) run, " + testsFailed.length + " failures");
diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js
index b85e8691..0ff86f94 100644
--- a/share/www/script/futon.browse.js
+++ b/share/www/script/futon.browse.js
@@ -205,6 +205,16 @@
$.cookies.get(db.name + ".reduce", "")
);
}
+ $("#viewcode textarea").change(function() {
+ if (page.viewLanguage == "javascript") {
+ try {
+ var func = eval("(" + $(this).val() + ")");
+ $(this).removeClass("invalid").next(".error").remove();
+ } catch (err) {
+ $(this).addClass("invalid").data("error", err.message);
+ }
+ }
+ });
page.populateLanguagesMenu();
}
diff --git a/share/www/style/layout.css b/share/www/style/layout.css
index 2df42734..a05b350f 100644
--- a/share/www/style/layout.css
+++ b/share/www/style/layout.css
@@ -314,6 +314,7 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
resize: none; width: 100%; overflow: auto;
}
#viewcode .code textarea:focus { background: #e9f4ff; }
+#viewcode .code textarea.invalid { background: #fee; color: #800; }
#viewcode .bottom { border-bottom: none; clear: left; padding: 1px 3px; }
#viewcode .bottom button { font-size: 90%; margin: 0 1em 0 0;
padding-left: 2em; padding-right: 2em;
@@ -453,9 +454,12 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
#tests tbody.content th { cursor: help; padding-left: 25px;
white-space: nowrap;
}
-#tests tbody.content th button {
- background-image: url(../image/run-mini.png);
+#tests tbody.content th button.run {
+ background: url(../image/run-mini.png) no-repeat; border: none;
+ cursor: pointer; float: left; margin: .2em 5px 0 -20px; padding: 0;
+ width: 15px; height: 15px;
}
+#tests tbody.content th button.run:hover { background-position: -15px 0; }
#tests tbody.content td.duration { text-align: right; width: 6em; }
#tests tbody.content td.status { background-position: 5px 8px;
background-repeat: no-repeat; color: #999; padding-left: 20px;