summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuelockwood <deathbearbrown@gmail.com>2013-11-04 14:48:46 -0500
committersuelockwood <deathbearbrown@gmail.com>2013-11-04 14:48:46 -0500
commitd38c68b7dfd06a7811091e7435b129011560c4d7 (patch)
treed64ac53a19db8190ed5666c27d524c9132da29c8
parent5d4ac9bd27fd49d464d846a9849d73c4b99183de (diff)
downloadcouchdb-d38c68b7dfd06a7811091e7435b129011560c4d7.tar.gz
Removing login_pane since it's not used.
Fixing buttons on advanced options Fixing Ace editor issue when hide/show toggling.
-rw-r--r--src/fauxton/app/modules/documents/views.js4
-rw-r--r--src/fauxton/app/templates/documents/advanced_options.html4
-rw-r--r--src/fauxton/app/templates/layouts/login_pane.html17
3 files changed, 5 insertions, 20 deletions
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 5c22504c8..b76d238e8 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -1378,7 +1378,8 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns) {
if ($targetId === 'index-nav') {
if (this.newView) { return; }
$index.toggle('slow');
- this.showEditors();
+ var that = this;
+ setTimeout(function(){that.showEditors();},100);
} else {
$index.removeAttr('style');
}
@@ -1478,6 +1479,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns) {
this.mapEditor.setValue(this.langTemplates[this.defaultLang].map);
this.reduceEditor.setValue(this.langTemplates[this.defaultLang].reduce);
}
+
}
});
diff --git a/src/fauxton/app/templates/documents/advanced_options.html b/src/fauxton/app/templates/documents/advanced_options.html
index c0bf44a49..d6cff7994 100644
--- a/src/fauxton/app/templates/documents/advanced_options.html
+++ b/src/fauxton/app/templates/documents/advanced_options.html
@@ -82,9 +82,9 @@ the License.
<div class="controls-group">
<div class="row-fluid">
<div id="button-options" class="controls controls-row">
- <button type="submit" class="btn btn-primary btn-large">Query</button>
+ <button type="submit" class="button btn-primary btn-large">Query</button>
<% if (showPreview) { %>
- <button class="btn btn-info btn-large preview">Preview</button>
+ <button class="button btn-info btn-large preview">Preview</button>
<% } %>
</div>
</div>
diff --git a/src/fauxton/app/templates/layouts/login_pane.html b/src/fauxton/app/templates/layouts/login_pane.html
deleted file mode 100644
index e145eef61..000000000
--- a/src/fauxton/app/templates/layouts/login_pane.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
--->
-
-<div id="login">
- <div id="login-wrapper"></div>
-</div> \ No newline at end of file