[richfaces-svn-commits] JBoss Rich Faces SVN: r9215 - trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.

[richfaces-svn-commits at lists.jboss.org]

Author: pkawiak
Date: 2008-06-25 07:48:15 -0400 (Wed, 25 Jun 2008)
New Revision: 9215

Modified:
   trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
Log:
Hotfixes for Opera

Modified: trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js
===================================================================
--- trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js	2008-06-25 11:47:54 UTC (rev 9214)
+++ trunk/sandbox/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableHeader.js	2008-06-25 11:48:15 UTC (rev 9215)
@@ -1,3 +1,6 @@
+/** 
+
+*/
 ExtendedDataTable.DataTable.header = Class.create(ClientUI.common.box.Box, {
 	// constructor
 	initialize: function($super, elementId, extDt) {
@@ -78,8 +81,6 @@
 		return this.headerRow.getHeight() + this.filterRow.getHeight();
 	},
 	OnMenuImageMouseDown: function(event) {
-		ClientUILib.log(ClientUILogger.EVENT, "OnMenuImageMouseDown.");
-		
 		var el = this.extDt._findParentElement(event, "th");
 		var columnId = (el) ? el.id : null;
 		
@@ -134,23 +135,17 @@
 			dropSpanRight.setStyle('height:'+headerRowHeight+'px');
 			dropSpanRight.setStyle('width:'+(w/2)+'px');
 		}
-		this.lastColWidth = this.getColumnWidth(this.getColumnsNumber()-1);
-		ClientUILib.log(ClientUILogger.INFO, 
-			"[adjustSeparators] lastColWidth = "+
-			this.lastColWidth+";"
-		);		
+		this.lastColWidth = this.extDt.getColumnWidth(this.getColumnsNumber()-1);
 		if (ClientUILib.isIE7){
 			this.lastColWidth -= 15;
 		}		
 	},
 	
 	OnSepClick: function(event) {
-		ClientUILib.log(ClientUILogger.EVENT, "OnSepClick.");
 		Event.stop(event);
 	},
 	
 	OnSepMouseDown: function(event) {
-		ClientUILib.log(ClientUILogger.EVENT, "OnSepMouseDown.");
 		Event.stop(event);
 		this.dragColumnInfo = {
 			srcElement: Event.element(event),
@@ -160,22 +155,16 @@
 			originalX: 0
 		};
 		var srcElement = this.dragColumnInfo.srcElement;
-		this.maxDelta = this.getColumnWidth(this.getColumnsNumber()-1);
-		this.maxDelta -= this.extDt.getScrollbarWidth();
+		if (ClientUILib.isOpera) {
+          this.maxDelta = this.extDt.getColumnWidth(this.getColumnsNumber()-1);
+          ClientUILib.log(ClientUILogger.INFO, "this.maxDelta: " + this.maxDelta);
+		}else{
+		  this.maxDelta = this.getColumnWidth(this.getColumnsNumber()-1);
+		  ClientUILib.log(ClientUILogger.INFO, "this.maxDelta: " + this.maxDelta);
+		  this.maxDelta -= this.extDt.getScrollbarWidth();
+		  ClientUILib.log(ClientUILogger.INFO, "this.extDt.getScrollbarWidth() " + this.extDt.getScrollbarWidth());
+        }
 		this.minDelta = this.minColumnWidth - this.getColumnWidth(srcElement.columnIndex);
-//		ClientUILib.log(ClientUILogger.INFO, 
-//			"[onSepMouseMove] minColumnWidth = "+this.minColumnWidth+";"
-//		);
-//		ClientUILib.log(ClientUILogger.INFO, 
-//			"[onSepMouseMove] minColumnWidth = "+this.minColumnWidth+";"
-//		);		
-//		ClientUILib.log(ClientUILogger.INFO, 
-//			"[onSepMouseMove] columnWidth = "+this.getColumnWidth(srcElement.columnIndex+1)+";"
-//		);		
-//		ClientUILib.log(ClientUILogger.INFO, 
-//			"[onSepMouseMove] mindelta = "+this.minDelta+";"
-//		);		
-		//this.dragColumnInfo.object = this.getColumns()[srcElement.columnIndex];
 		Event.observe(document, 'mousemove', this.eventSepMouseMove, true);
 		Event.observe(document, 'mouseup', this.eventSepMouseUp, true);
 	},
@@ -207,7 +196,6 @@
 	
 	OnSepMouseUp: function(event) {
 		var colsNumber = this.getColumnsNumber();
-		ClientUILib.log(ClientUILogger.EVENT, "OnSepMouseUp.");
 		Event.stop(event);
 		Event.stopObserving(document, 'mousemove', this.eventSepMouseMove);
 		Event.stopObserving(document, 'mouseup', this.eventSepMouseUp);
@@ -264,36 +252,9 @@
 			if (delta > this.maxDelta) {
 				delta = this.maxDelta;
 			}
+			ClientUILib.log(ClientUILogger.INFO, "maxDelta: " + this.maxDelta);
 			var x = this.dragColumnInfo.originalX + delta;
 			var finalX = x - this.minColumnWidth - 6;
-//			ClientUILib.log(ClientUILogger.INFO, 
-//				"[onSepMouseMove] maxDelta = "+this.maxDelta+";"
-//			);
-//			ClientUILib.log(ClientUILogger.INFO, 
-//				"[onSepMouseMove] originalX = "+this.dragColumnInfo.originalX+";"
-//			);			
-			ClientUILib.log(ClientUILogger.INFO, 
-				"[onSepMouseMove] delta = "+delta+";"
-			);
-			ClientUILib.log(ClientUILogger.INFO, 
-				"[onSepMouseMove] mindelta = "+this.minDelta+";"
-			);			
-//			ClientUILib.log(ClientUILogger.INFO, 
-//				"[onSepMouseMove] object.offsetWidth = "+
-//				parseInt(this.dragColumnInfo.object.width)+";"
-//			);
-//			ClientUILib.log(ClientUILogger.INFO, 
-//				"[onSepMouseMove] minColumnWidth = "+minColumnWidth+";"
-//			);			
-//			ClientUILib.log(ClientUILogger.INFO,
-//				"[onSepMouseMove] x = "+x+";"
-//			);
-//			ClientUILib.log(ClientUILogger.INFO,
-//				"[onSepMouseMove] finalX = "+finalX+";"
-//			);
-//			ClientUILib.log(ClientUILogger.INFO,
-//				"[onSepMouseMove] ----------------------------"
-//			);
 			this.columnSplitter.moveToX(finalX); 				
 			Event.stop(event);
 		}