You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/03/20 11:21:45 UTC
[21/26] couchdb commit: updated refs/heads/Query-Options-UI to cf93bbf
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/2f056a81
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2f056a81
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2f056a81
Branch: refs/heads/Query-Options-UI
Commit: 2f056a8141bc0c4ce2de98ef8340e123ef86d4db
Parents: 5d3e3ea
Author: suelockwood <de...@apache.org>
Authored: Wed Mar 19 11:36:36 2014 -0400
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Mar 20 10:33:47 2014 +0200
----------------------------------------------------------------------
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/2f056a81/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/2f056a81/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/2f056a81/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 1e7addf..135ba31 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");
},