summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuelockwood <deathbearbrown@gmail.com>2013-09-05 12:12:16 -0400
committersuelockwood <deathbearbrown@gmail.com>2013-09-05 12:12:16 -0400
commit7069970495cfed91ca3eaa80946988864008df9d (patch)
tree7ace6c028304f8d66d9b85c77b3d8a6d33f466e7
parent063e3992749214bcceb8849080048a6ae54e6141 (diff)
downloadcouchdb-7069970495cfed91ca3eaa80946988864008df9d.tar.gz
Cleaning up resize collumns to use a class selector instead of an ID. Also added cleanup method to remove callback.
-rw-r--r--src/fauxton/app/resizeColumns.js6
-rw-r--r--src/fauxton/app/templates/layouts/one_pane.html2
-rw-r--r--src/fauxton/app/templates/layouts/with_right_sidebar.html2
-rw-r--r--src/fauxton/app/templates/layouts/with_sidebar.html2
-rw-r--r--src/fauxton/app/templates/layouts/with_tabs.html2
-rw-r--r--src/fauxton/app/templates/layouts/with_tabs_sidebar.html2
6 files changed, 10 insertions, 6 deletions
diff --git a/src/fauxton/app/resizeColumns.js b/src/fauxton/app/resizeColumns.js
index 0073690c4..687b9d345 100644
--- a/src/fauxton/app/resizeColumns.js
+++ b/src/fauxton/app/resizeColumns.js
@@ -25,7 +25,7 @@ function(mixins) {
var Resize = function(options){
this.options = options;
- this.options.selectorElements = options.selectorElements || "#dashboard-content";
+ this.options.selectorElements = options.selectorElements || ".window-resizeable";
};
Resize.prototype = {
@@ -49,10 +49,14 @@ function(mixins) {
updateOptions:function(options){
this.options = {};
this.options = options;
+ this.options.selectorElements = options.selectorElements || ".window-resizeable";
},
turnOff:function(){
mixins.removeWindowResize("animation");
},
+ cleanupCallback: function(){
+ this.callback = null;
+ },
onResizeHandler: function (){
//if there is an override, do that instead
if (this.options.onResizeHandler){
diff --git a/src/fauxton/app/templates/layouts/one_pane.html b/src/fauxton/app/templates/layouts/one_pane.html
index baafbf8d0..c7adf1f6f 100644
--- a/src/fauxton/app/templates/layouts/one_pane.html
+++ b/src/fauxton/app/templates/layouts/one_pane.html
@@ -22,7 +22,7 @@ the License.
<div class="row-fluid content-area">
<div id="tabs" class="row"></div>
- <div id="dashboard-content"></div>
+ <div id="dashboard-content" class="window-resizeable"></div>
</div>
</div>
diff --git a/src/fauxton/app/templates/layouts/with_right_sidebar.html b/src/fauxton/app/templates/layouts/with_right_sidebar.html
index 1923ced37..ade5b8207 100644
--- a/src/fauxton/app/templates/layouts/with_right_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_right_sidebar.html
@@ -20,7 +20,7 @@ the License.
</div>
<div class="with-sidebar-right content-area">
<div id="dashboard-content" class="list"></div>
- <div id="sidebar-content" class="sidebar pull-right"></div>
+ <div id="sidebar-content" class="sidebar pull-right window-resizeable"></div>
</div>
</div>
diff --git a/src/fauxton/app/templates/layouts/with_sidebar.html b/src/fauxton/app/templates/layouts/with_sidebar.html
index bd26e5bfa..0bba4a1e4 100644
--- a/src/fauxton/app/templates/layouts/with_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_sidebar.html
@@ -21,7 +21,7 @@ the License.
</header>
<div class="with-sidebar content-area">
<div id="sidebar-content" class="sidebar"></div>
- <div id="dashboard-content" class="list"></div>
+ <div id="dashboard-content" class="list window-resizeable"></div>
</div>
</div>
diff --git a/src/fauxton/app/templates/layouts/with_tabs.html b/src/fauxton/app/templates/layouts/with_tabs.html
index bf635177d..8bfc7e0bf 100644
--- a/src/fauxton/app/templates/layouts/with_tabs.html
+++ b/src/fauxton/app/templates/layouts/with_tabs.html
@@ -22,7 +22,7 @@ the License.
<div class="row-fluid content-area">
<div id="tabs" class="row-fluid"></div>
- <div id="dashboard-content" class="list span12"></div>
+ <div id="dashboard-content" class="list span12 window-resizeable"></div>
</div>
diff --git a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
index e7a524f2b..69d723b7c 100644
--- a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
@@ -27,7 +27,7 @@ the License.
<aside id="sidebar-content" class="sidebar"></aside>
- <section id="dashboard-content" class="list pull-right">
+ <section id="dashboard-content" class="list pull-right window-resizeable">
<div class="inner">
<div id="dashboard-upper-menu"></div>
<div id="dashboard-upper-content"></div>