Refire the master object resize() event to make sure fix various fitH…

…eightToBottom problems. Should fix #709 Adapt FoldersTree in ajxp_conf to fit non-null parent.
pydio · Nov 20, 2014 · 70bffc1 · 70bffc1
1 parent a313f11
commit 70bffc1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/ajxp_conf.css b/core/src/plugins/access.ajxp_conf/ajxp_conf.css
@@ -80,6 +80,7 @@
 .settings_main_pane #leftPane #settings_pane{
     opacity: 1;
     transition: opacity 0.3s ease;
+    position: relative;
 }
 
 .settings_main_pane #leftPane.folded #settings_pane{

diff --git a/core/src/plugins/access.ajxp_conf/manifest.xml b/core/src/plugins/access.ajxp_conf/manifest.xml
@@ -89,7 +89,7 @@
                         <div id="flagged_elements" ajxpClass="FetchedResultPane" ajxpOptions='{"nodeProviderProperties":{"get_action":"get_bookmarks", "format":"node_list"},"reloadOnServerMessage":"tree/reload_bookmarks"}'></div>
                         <div id="leftPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
                             <div id="search_container_settings" class="settings_search_container" ajxpClass="SearchEngine" ajxpOptions='{"toggleResultsVisibility":"search_results_cont", "fitMarginBottom":10}'></div>
-                            <div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"display":"dz","replaceScroller":true}' ></div>
+                            <div id="settings_pane" class="flat_tree_pane" ajxpClass="FoldersTree" ajxpOptions='{"fit":"height", "fitParent":"leftPane", "display":"dz","replaceScroller":true}' ></div>
                         </div>
                     </div>
                     <div id="rightPane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height", "messageBoxReference":true}'>

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer.js
diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.Ajaxplorer.js
@@ -525,6 +525,13 @@ Class.create("Ajaxplorer", {
 		for(var i=0;i<nodes.length;i++){
 			this.setGuiComponentConfig(nodes[i]);
 		}
+        var element = $(window.ajxpBootstrap.parameters.get("MAIN_ELEMENT"));
+        if(element && element.ajxpPaneObject &&  element.ajxpPaneObject.resize){
+            window.setTimeout(function(){
+                // Fire top resize event once after all css are loaded.
+                element.ajxpPaneObject.resize();
+            }, 500);
+        }
 	},
 
 	/**

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FoldersTree.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.FoldersTree.js
@@ -186,7 +186,7 @@ Class.create("FoldersTree", AjxpPane, {
 	 */
 	resize : function(){
         if(!this.options['fit'] || this.options['fit'] != 'content'){
-            fitHeightToBottom(this.treeContainer, null);
+            fitHeightToBottom(this.treeContainer, this.options['fitParent']);
         }
         if(this.scrollbar){
             this.scroller.setStyle({height:parseInt(this.treeContainer.getHeight())+'px'});