Fix resize-chain for Tabulator in IE

pydio · Jul 28, 2014 · d7154dd · d7154dd
1 parent 5f7d4a1
commit d7154dd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
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
@@ -863,7 +863,11 @@ Class.create("Ajaxplorer", {
 	},
 
 	getPluginConfigs : function(pluginQuery){
-		var properties = XPathSelectNodes(this._registry, 'plugins/'+pluginQuery+'/plugin_configs/property | plugins/*[@id="core.'+pluginQuery+'"]/plugin_configs/property | plugins/*[@id="'+pluginQuery+'"]/plugin_configs/property');
+        var xpath = 'plugins/*[@id="core.'+pluginQuery+'"]/plugin_configs/property | plugins/*[@id="'+pluginQuery+'"]/plugin_configs/property';
+        if(pluginQuery.indexOf('.') == -1){
+            xpath = 'plugins/'+pluginQuery+'/plugin_configs/property |' + xpath;
+        }
+		var properties = XPathSelectNodes(this._registry, xpath );
 		var configs = $H();
 		for(var i = 0; i<properties.length; i++){
 			var propNode = properties[i];

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpTabulator.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpTabulator.js
@@ -452,6 +452,9 @@ Class.create("AjxpTabulator", AjxpPane, {
 	 */
 	resize : function(size, loop){
 		if(!this.selectedTabInfo || !this.htmlElement) return;
+        if(this.options.fit && this.options.fit == 'height'){
+            fitHeightToBottom(this.htmlElement, this.options.fitParent);
+        }
         if(this.htmlElement.hasClassName('horizontal_tabulator')){
             var tabContainer = this.htmlElement.down('div.tabulatorContainer');
             fitHeightToBottom(tabContainer, null, this.options.fitMarginBottom);
@@ -461,7 +464,7 @@ Class.create("AjxpTabulator", AjxpPane, {
 		var ajxpObject = this.getAndSetAjxpObject(this.selectedTabInfo);
 		if(ajxpObject && !ajxpObject.fullScreenMode){
             var nodeElement = $(this.htmlElement).down("#"+this.selectedTabInfo.element);
-            fitHeightToBottom(nodeElement, null, this.options.fitMarginBottom);
+            fitHeightToBottom(nodeElement, this.htmlElement, this.options.fitMarginBottom);
             ajxpObject.resize(nodeElement?nodeElement.getHeight():this.htmlElement.getHeight());
             var left ;
             var total = 0;