IE fixes

pydio · Sep 22, 2013 · d49cb24 · d49cb24
1 parent 04269df
commit d49cb24
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 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.ActionsToolbar.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.ActionsToolbar.js
@@ -244,7 +244,7 @@ Class.create("ActionsToolbar", {
                     button.OBSERVERS.each(function(pair){
                         button.ACTION.stopObserving(pair.key, pair.value);
                     });
-                    button.remove();
+                    try{button.remove();}catch(e){}
                 }
             });
         }

diff --git a/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpPane.js b/core/src/plugins/gui.ajax/res/js/ajaxplorer/class.AjxpPane.js
@@ -112,7 +112,7 @@ Class.create("AjxpPane", {
     			var expr = this.options.fitMarginBottom;
     			try{marginBottom = parseInt(eval(expr));}catch(e){}
     		}
-    		fitHeightToBottom(this.htmlElement, (this.options.fitParent?$(this.options.fitParent):null), expr);
+    		fitHeightToBottom(this.htmlElement, (this.options.fitParent?$(this.options.fitParent):null), marginBottom);
     	}
     	this.childrenPanes.invoke('resize');
 	},

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
@@ -302,7 +302,9 @@ Class.create("AjxpTabulator", AjxpPane, {
                 this.tabulatorData.each(function(tabInfo){
                     var header = tabInfo.headerElement;
                     if(tabInfo != this.selectedTabInfo){
-                        header.setStyle({width:part - ( parseInt(header.getStyle('paddingRight')) + parseInt(header.getStyle('paddingLeft')) +  parseInt(header.getStyle('borderRightWidth'))  +  parseInt(header.getStyle('borderLeftWidth')) ) + 'px'});
+                        try{
+                            header.setStyle({width:part - ( parseInt(header.getStyle('paddingRight')) + parseInt(header.getStyle('paddingLeft')) +  parseInt(header.getStyle('borderRightWidth'))  +  parseInt(header.getStyle('borderLeftWidth')) ) + 'px'});
+                        }catch(e){}
                     }
                 }.bind(this));
             }

diff --git a/core/src/plugins/gui.ajax/res/js/lib/prototype/splitter.js b/core/src/plugins/gui.ajax/res/js/lib/prototype/splitter.js
@@ -545,7 +545,8 @@ Class.create("Splitter", AjxpPane, {
 				Math.min(np, this.paneA._max||9999, this.group._adjust - this.splitbar._adjust - 
 				Math.max(this.paneB._min+this.paneB._padAdjust, this.options.minSize)));
 		var optNameSet = this.options.set;				
-		var optNameAdjust = this.options.adjust;				
+		var optNameAdjust = this.options.adjust;
+        if(!np) np = 200;
 		this.splitbar.setStyle(this.makeStyleObject(this.options.set, np+'px'));
 		var borderAdjA = 0;
 		var borderAdjB = 0;