Repository: couchdb Updated Branches: refs/heads/Query-Options-UI e70533685 -> 75c5098a1
Enable Limit and Skip again Change the keys input to a textarea Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/75c5098a Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/75c5098a Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/75c5098a Branch: refs/heads/Query-Options-UI Commit: 75c5098a1fd30f688814e1e60e3ad7faf6a52561 Parents: e705336 Author: suelockwood <[email protected]> Authored: Wed Mar 19 11:36:36 2014 -0400 Committer: suelockwood <[email protected]> Committed: Wed Mar 19 11:36:36 2014 -0400 ---------------------------------------------------------------------- src/fauxton/app/addons/documents/assets/less/documents.less | 4 ++++ .../app/addons/documents/templates/advanced_options.html | 9 ++++----- src/fauxton/app/addons/documents/views.js | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/75c5098a/src/fauxton/app/addons/documents/assets/less/documents.less ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less index 61d864b..40a1d8c 100644 --- a/src/fauxton/app/addons/documents/assets/less/documents.less +++ b/src/fauxton/app/addons/documents/assets/less/documents.less @@ -39,6 +39,10 @@ button.beautify { } +#query div.controls-group.well{ + height: 150px; +} + /** used in all_docs_list.html **/ .view { table td div { http://git-wip-us.apache.org/repos/asf/couchdb/blob/75c5098a/src/fauxton/app/addons/documents/templates/advanced_options.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/advanced_options.html b/src/fauxton/app/addons/documents/templates/advanced_options.html index 8acf30a..f823d1a 100644 --- a/src/fauxton/app/addons/documents/templates/advanced_options.html +++ b/src/fauxton/app/addons/documents/templates/advanced_options.html @@ -28,7 +28,7 @@ the License. <div class="controls-group well"> <div class="row-fluid" id="js-showKeys"> <div class="controls controls-row"> - <input name="keys" class="input-xxlarge" type="text" placeholder="Enter a key, an array of keys. This must be valid JSON."> + <textarea name="keys" class="input-xxlarge" rows="5" type="text" placeholder="Enter a key, an array of keys. This must be valid JSON."></textarea> </div> </div> <div class="row-fluid hide" id="js-showStartEnd"> @@ -48,7 +48,7 @@ the License. <div class="controls-group"> <label class="drop-down inline"> Limit: - <select name="limit" class="input-small" disabled> + <select name="limit" class="input-small"> <option>5</option> <option>10</option> <option selected="selected">20</option> @@ -59,10 +59,9 @@ the License. </select> </label> <label for="skipRows" class="inline drop-down"> - Skip - <input name="skip" class="input-large" type="text" id="skipRows" disabled placeholder="Number of rows to skip"> + Skip: + <input name="skip" class="input-large" type="text" id="skipRows" placeholder="Number of rows to skip"> </label> - <span class="js-disabled-message"> Limit & and Skip are disabled when using Keys.</span> <div class="checkbox inline"> <input id="check1" type="checkbox" name="include_docs" value="true"> http://git-wip-us.apache.org/repos/asf/couchdb/blob/75c5098a/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 49ce286..6a4a79e 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -1107,13 +1107,13 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum showKeys: function(){ this.$("#js-showKeys, .js-disabled-message").show(); - this.$('[name="skip"],[name="startkey"],[name="limit"],[name="endkey"],[name="inclusive_end"]').attr("disabled","true"); + this.$('[name="startkey"],[name="endkey"],[name="inclusive_end"]').attr("disabled","true"); this.$('[name="keys"]').removeAttr("disabled"); }, showStartEnd: function(){ this.$("#js-showStartEnd").show(); - this.$('[name="skip"],[name="startkey"],[name="limit"],[name="endkey"],[name="inclusive_end"]').removeAttr("disabled"); + this.$('[name="startkey"],[name="endkey"],[name="inclusive_end"]').removeAttr("disabled"); this.$('.js-disabled-message').hide(); this.$('[name="keys"]').attr("disabled","true"); },
