summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuelockwood <deathbearbrown@gmail.com>2013-09-06 10:51:15 -0400
committersuelockwood <deathbearbrown@gmail.com>2013-09-06 10:51:15 -0400
commit4eb2a38f28859bdfef8c7dd97a6456db708b48d7 (patch)
treec0d2c8fab1fbc8b7b31701cf1adb1f17553fc19d
parent98dfd62b0b29077f175c01fe6abb5ca9dcb7ecda (diff)
downloadcouchdb-4eb2a38f28859bdfef8c7dd97a6456db708b48d7.tar.gz
Fixing cases of resize collumns to use the generic selectors
-rw-r--r--src/fauxton/app/modules/documents/views.js5
-rw-r--r--src/fauxton/app/modules/fauxton/base.js4
-rw-r--r--src/fauxton/app/templates/documents/view_editor.html2
-rw-r--r--src/fauxton/app/templates/layouts/with_tabs_sidebar.html2
4 files changed, 3 insertions, 10 deletions
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 8f9af4911..6b63c15b9 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -1192,11 +1192,6 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint, resizeColumns)
afterRender: function() {
- //resizeAnimation
- app.resizeColumns = new resizeColumns({
- selectorElements: '#dashboard-content, #dashboard-upper-menu, #db-views-tabs-nav'
- });
- app.resizeColumns.onResizeHandler();
var that = this,
mapFun = this.$("#map-function"),
diff --git a/src/fauxton/app/modules/fauxton/base.js b/src/fauxton/app/modules/fauxton/base.js
index 0b11849fa..8fa40fa2f 100644
--- a/src/fauxton/app/modules/fauxton/base.js
+++ b/src/fauxton/app/modules/fauxton/base.js
@@ -22,9 +22,7 @@ function(app, Backbone, resizeColumns) {
//resizeAnimation
- app.resizeColumns = new resizeColumns({
- selectorElements: '#dashboard-content, #dashboard-upper-menu'
- });
+ app.resizeColumns = new resizeColumns({});
app.resizeColumns.onResizeHandler();
var Fauxton = app.module();
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index 9aaa503f3..13b92b17a 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
<div class="row">
- <ul class="nav nav-tabs" id="db-views-tabs-nav">
+ <ul class="nav nav-tabs window-resizeable" id="db-views-tabs-nav">
<li class="active"> <a class="fonticon-wrench fonticon" data-toggle="tab" href="#index"><% if (newView) { %>Create Index <% } else { %>Edit Index <% } %></a></li>
<li><a class="fonticon-plus fonticon" href="#query" data-toggle="tab">Advanced Options</a></li>
<li><a href="#metadata" data-toggle="tab">Design Doc Metadata</a></li>
diff --git a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
index 69d723b7c..d4efc8df1 100644
--- a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
@@ -29,7 +29,7 @@ the License.
<section id="dashboard-content" class="list pull-right window-resizeable">
<div class="inner">
- <div id="dashboard-upper-menu"></div>
+ <div id="dashboard-upper-menu" class="window-resizeable"></div>
<div id="dashboard-upper-content"></div>
<div id="dashboard-lower-content"></div>