Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 62169179F9 for ; Mon, 9 Mar 2015 19:48:52 +0000 (UTC) Received: (qmail 60942 invoked by uid 500); 9 Mar 2015 19:48:47 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 60894 invoked by uid 500); 9 Mar 2015 19:48:47 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 60882 invoked by uid 99); 9 Mar 2015 19:48:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Mar 2015 19:48:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12466E180E; Mon, 9 Mar 2015 19:48:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: michellep@apache.org To: commits@couchdb.apache.org Message-Id: <09328de873ac48289f3be721d2e32e2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: fauxton commit: updated refs/heads/master to 2764511 Date: Mon, 9 Mar 2015 19:48:47 +0000 (UTC) Repository: couchdb-fauxton Updated Branches: refs/heads/master a145a63a8 -> 276451138 Remove 'Edit Query' Link from End of Results footer Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/27645113 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/27645113 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/27645113 Branch: refs/heads/master Commit: 2764511386a36aadb77c4961fd295d2ed6fdc2fb Parents: a145a63 Author: michellephung@gmail.com Authored: Wed Mar 4 11:23:19 2015 -0500 Committer: michellephung@gmail.com Committed: Mon Mar 9 15:48:03 2015 -0400 ---------------------------------------------------------------------- app/addons/documents/templates/all_docs_list.html | 2 +- app/addons/documents/views-queryoptions.js | 3 --- app/addons/documents/views.js | 8 +------- 3 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/27645113/app/addons/documents/templates/all_docs_list.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/all_docs_list.html b/app/addons/documents/templates/all_docs_list.html index a26b7d5..2e10e6e 100644 --- a/app/addons/documents/templates/all_docs_list.html +++ b/app/addons/documents/templates/all_docs_list.html @@ -18,7 +18,7 @@ the License. <% if (endOfResults) { %>

- End of results - edit query + End of results

<% } %> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/27645113/app/addons/documents/views-queryoptions.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views-queryoptions.js b/app/addons/documents/views-queryoptions.js index ae4e467..2271882 100644 --- a/app/addons/documents/views-queryoptions.js +++ b/app/addons/documents/views-queryoptions.js @@ -58,8 +58,6 @@ define([ // always contains all options. [This does a deep copy: we never overwrite defaultOptions!] this.options = $.extend(true, {}, defaultOptions, options); - // add any general events relating to the Query Options tray - FauxtonAPI.Events.on('QueryOptions:openTray', this.showTray, this); $(window).on("resize", this.onResize); // initialize the parent View @@ -81,7 +79,6 @@ define([ }, cleanup: function () { - FauxtonAPI.Events.off("QueryOptions:openTray"); $(window).off("resize", this.onResize); }, http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/27645113/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js index 4e23007..c36d04f 100644 --- a/app/addons/documents/views.js +++ b/app/addons/documents/views.js @@ -273,8 +273,7 @@ function (app, FauxtonAPI, Components, Documents, }, events: { - 'change input': 'toggleDocument', - "click #js-end-results": "openQueryOptionsTray" + 'change input': 'toggleDocument' }, initialize: function (options) { @@ -355,11 +354,6 @@ function (app, FauxtonAPI, Components, Documents, }); }, - openQueryOptionsTray: function(e) { - e.preventDefault(); - FauxtonAPI.Events.trigger("QueryOptions:openTray"); - }, - establish: function() { if (this.newView) { return null; }