summaryrefslogtreecommitdiff
path: root/share/www
diff options
context:
space:
mode:
authorChristopher Lenz <cmlenz@apache.org>2008-12-05 17:16:09 +0000
committerChristopher Lenz <cmlenz@apache.org>2008-12-05 17:16:09 +0000
commit8205d358f94c80659f8fd887c2395d265688a718 (patch)
tree4ab40a32e9e8fd1341d617cfdf7701b793e061a0 /share/www
parentc1b6b981be10a2ef942e6b06bfc56c67c0057dcb (diff)
Don't automatically execute temp view in Futon when the page is loaded, but rather defer until the Run button is clicked.
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@723793 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www')
-rw-r--r--share/www/browse/database.html7
-rw-r--r--share/www/script/browse.js3
2 files changed, 8 insertions, 2 deletions
diff --git a/share/www/browse/database.html b/share/www/browse/database.html
index fe17a47b..f1f25e9e 100644
--- a/share/www/browse/database.html
+++ b/share/www/browse/database.html
@@ -79,7 +79,12 @@ specific language governing permissions and limitations under the License.
page.populateViewsMenu();
page.populateViewEditor();
- page.updateDocumentListing();
+ if (!page.isTempView) {
+ page.updateDocumentListing();
+ } else {
+ $("#viewcode").show().removeClass("collapsed").find("textarea")[0].focus();
+ $("#documents").hide();
+ }
$("#switch select").change(function() {
var viewName = $(this).val();
diff --git a/share/www/script/browse.js b/share/www/script/browse.js
index dde31c05..1417a96b 100644
--- a/share/www/script/browse.js
+++ b/share/www/script/browse.js
@@ -115,6 +115,7 @@ function CouchDatabasePage() {
this.viewName = viewName;
this.db = db;
this.isDirty = false;
+ this.isTempView = viewName == "_temp_view";
page = this;
this.addDocument = function() {
@@ -393,7 +394,7 @@ function CouchDatabasePage() {
$.cookies.remove(dbName + ".desc");
}
$("#paging a").unbind();
- $("#documents tbody.content").empty();
+ $("#documents").find("tbody.content").empty().end().show();
this.updateDesignDocLink();
options.success = function(resp) {