Index: /FCKeditor/branches/developers/martinkou/editor/plugins/dragresizetable/fckplugin.js
===================================================================
--- /FCKeditor/branches/developers/martinkou/editor/plugins/dragresizetable/fckplugin.js	(revision 464)
+++ /FCKeditor/branches/developers/martinkou/editor/plugins/dragresizetable/fckplugin.js	(revision 465)
@@ -44,12 +44,12 @@
 	"_GetWindowPosition" : function( w, node )
 	{
-		var pos = FCKDragTableHandler._GetDocumentPosition( w, node ) ;
-		pos.x -= FCKDragTableHandler._GetWindowScrollX( w ) ;
-		pos.y -= FCKDragTableHandler._GetWindowScrollY( w ) ;
+		var pos = this._GetDocumentPosition( w, node ) ;
+		pos.x -= this._GetWindowScrollX( w ) ;
+		pos.y -= this._GetWindowScrollY( w ) ;
 		return pos ;
 	},
 	"_IsInsideNode" : function( w, domNode, pos )
 	{
-		var myCoords = FCKDragTableHandler._GetWindowPosition( w, domNode ) ; 
+		var myCoords = this._GetWindowPosition( w, domNode ) ; 
 		var xMin = myCoords.x ;
 		var yMin = myCoords.y ;
@@ -82,5 +82,5 @@
 		for ( var i = 0 ; i < cells.length ; i++ )
 		{
-			var pos = FCKDragTableHandler._GetWindowPosition( w, cells[i] ) ;
+			var pos = this._GetWindowPosition( w, cells[i] ) ;
 			var rightX = pos.x + parseInt( cells[i].clientWidth ) ;
 			var rxDist = mouse.x - rightX ;
@@ -88,5 +88,5 @@
 			if ( minRxDist == null || 
 					( Math.abs( rxDist ) <= Math.abs( minRxDist ) &&
-					  ( minYDist == null || Math.abs( yDist ) < Math.abs( minYDist ) ) ) )
+					  ( minYDist == null || Math.abs( yDist ) <= Math.abs( minYDist ) ) ) )
 			{
 				minRxDist = rxDist ;
@@ -102,5 +102,5 @@
 
 		// Abort if too far from the border.
-		lxDist = mouse.x - FCKDragTableHandler._GetWindowPosition( w, lbCell ).x ;
+		lxDist = mouse.x - this._GetWindowPosition( w, lbCell ).x ;
 		if ( lxDist < 0 && minRxDist < 0 && minRxDist < -2 )
 			return null ; 
@@ -127,5 +127,5 @@
 			evt = window.event ;
 		FCKDragTableHandler._MouseMoveMode = 0 ;
-		FCKDragTableHandler._HideResizeBar() ;
+		FCKDragTableHandler._HideResizeBar.apply( FCKDragTableHandler, [] ) ;
 		
 		if ( ! FCKDragTableHandler._LeftCell )
@@ -138,5 +138,6 @@
 		if ( mouseDocument == FCK.EditorDocument )
 		{
-			var offset = FCKDragTableHandler._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+			var offset = FCKDragTableHandler._GetDocumentPosition.apply( FCKDragTableHandler, 
+					[ window, FCK.EditingArea.IFrame ] ) ;
 			mouse.x += offset.x ;
 			mouse.y += offset.y ;
@@ -155,5 +156,5 @@
 			{
 				var cell = row.cells.item( c ) ;
-				var width = FCKDragTableHandler._GetCellWidth( table, cell ) ;
+				var width = FCKDragTableHandler._GetCellWidth.apply( FCKDragTableHandler, [ table, cell ] ) ;
 				var colSpan = parseInt( cell.colSpan ) ;
 				if ( colSpan != colSpan )
@@ -237,7 +238,7 @@
 			evt = window.event ;		
 		if ( FCKDragTableHandler._MouseMoveMode == 0 )
-			return FCKDragTableHandler._MouseFindHandler( FCK, evt ) ;
-		else
-			return FCKDragTableHandler._MouseDragHandler( FCK, evt ) ;
+			return FCKDragTableHandler._MouseFindHandler.apply( FCKDragTableHandler, [ FCK, evt ] ) ;
+		else
+			return FCKDragTableHandler._MouseDragHandler.apply( FCKDragTableHandler, [ FCK, evt ] ) ;
 	},
 	// Calculate the padding of a table cell.
@@ -291,5 +292,5 @@
 		if ( clientWidth != clientWidth )		// NaN possible? lets just be safe...
 			clientWidth = 0 ;
-		return clientWidth - FCKDragTableHandler._GetCellPadding( table, cell ) ;
+		return clientWidth - this._GetCellPadding( table, cell ) ;
 	},
 	"MouseMoveListener" : function( FCK, evt )
@@ -307,5 +308,5 @@
 			if ( ! node || node.nodeType != 1 )
 			{
-				FCKDragTableHandler._HideResizeBar() ;
+				this._HideResizeBar() ;
 				return ;
 			}
@@ -313,5 +314,5 @@
 		catch ( e )
 		{
-			FCKDragTableHandler._HideResizeBar() ;
+			this._HideResizeBar() ;
 			return ;
 		}
@@ -324,5 +325,5 @@
 		if ( node.ownerDocument == document )
 		{
-			var offset = FCKDragTableHandler._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+			var offset = this._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
 			mouseX -= offset.x ;
 			mouseY -= offset.y ;
@@ -330,9 +331,9 @@
 
 
-		if ( FCKDragTableHandler._ResizeBar && FCKDragTableHandler._LeftCell )
-		{
-			var leftPos = FCKDragTableHandler._GetWindowPosition( FCK.EditorWindow, FCKDragTableHandler._LeftCell ) ;
-			var rightPos = FCKDragTableHandler._GetWindowPosition( FCK.EditorWindow, FCKDragTableHandler._RightCell ) ; 
-			var rxDist = mouseX - ( leftPos.x + FCKDragTableHandler._LeftCell.clientWidth ) ;
+		if ( this._ResizeBar && this._LeftCell )
+		{
+			var leftPos = this._GetWindowPosition( FCK.EditorWindow, this._LeftCell ) ;
+			var rightPos = this._GetWindowPosition( FCK.EditorWindow, this._RightCell ) ; 
+			var rxDist = mouseX - ( leftPos.x + this._LeftCell.clientWidth ) ;
 			var lxDist = mouseX - rightPos.x ;
 			var inRangeFlag = false ;
@@ -345,6 +346,6 @@
 			if ( inRangeFlag )
 			{
-				FCKDragTableHandler._ShowResizeBar( FCK.EditorWindow, 
-					FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" ),
+				this._ShowResizeBar( FCK.EditorWindow, 
+					FCKTools.GetElementAscensor( this._LeftCell, "table" ),
 					{ "x" : mouseX, "y" : mouseY } ) ;
 				return ;
@@ -355,24 +356,24 @@
 		if ( tagName != "table" && tagName != "td" && tagName != "th" )
 		{
-			if ( FCKDragTableHandler._LeftCell )
-				FCKDragTableHandler._LeftCell = FCKDragTableHandler._RightCell = null ;
-			FCKDragTableHandler._HideResizeBar() ;
+			if ( this._LeftCell )
+				this._LeftCell = this._RightCell = null ;
+			this._HideResizeBar() ;
 			return ;
 		}
 		node = FCKTools.GetElementAscensor( node, "table" ) ;
-		var cellTuple = FCKDragTableHandler._GetBorderCells( FCK.EditorWindow, node, { "x" : mouseX, "y" : mouseY } ) ;
+		var cellTuple = this._GetBorderCells( FCK.EditorWindow, node, { "x" : mouseX, "y" : mouseY } ) ;
 
 		if ( cellTuple == null )
 		{
-			if ( FCKDragTableHandler._LeftCell )
-				FCKDragTableHandler._LeftCell = FCKDragTableHandler._RightCell = null ;
-			FCKDragTableHandler._HideResizeBar() ;
-		}
-		else
-		{
-			FCKDragTableHandler._LeftCell = cellTuple["leftCell"] ;
-			FCKDragTableHandler._RightCell = cellTuple["rightCell"] ;
-			FCKDragTableHandler._ShowResizeBar( FCK.EditorWindow, 
-					FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" ),
+			if ( this._LeftCell )
+				this._LeftCell = this._RightCell = null ;
+			this._HideResizeBar() ;
+		}
+		else
+		{
+			this._LeftCell = cellTuple["leftCell"] ;
+			this._RightCell = cellTuple["rightCell"] ;
+			this._ShowResizeBar( FCK.EditorWindow, 
+					FCKTools.GetElementAscensor( this._LeftCell, "table" ),
 					{ "x" : mouseX, "y" : mouseY } ) ;
 		}
@@ -383,23 +384,23 @@
 
 		// Check if the mouse cursor is still inside the table's area.
-		var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" );
-		var offset = FCKDragTableHandler._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+		var table = FCKTools.GetElementAscensor( this._LeftCell, "table" );
+		var offset = this._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
 		var innerMouse = { "x" : mouse.x - offset.x, "y" : mouse.y - offset.y } ;
-		if ( ! FCKDragTableHandler._IsInsideNode( FCK.EditorWindow, table, innerMouse ) ) 
-		{
-			FCKDragTableHandler._MouseMoveMode = 0 ;
-			FCKDragTableHandler._HideResizeBar() ;
+		if ( ! this._IsInsideNode( FCK.EditorWindow, table, innerMouse ) ) 
+		{
+			this._MouseMoveMode = 0 ;
+			this._HideResizeBar() ;
 			return ;
 		}
 
-		var docX = mouse.x + FCKDragTableHandler._GetWindowScrollX( window ) ;
-		FCKDragTableHandler._ResizeBar.style.left = ( docX - FCKDragTableHandler._ResizeBar.offsetWidth / 2 ) + "px" ;
+		var docX = mouse.x + this._GetWindowScrollX( window ) ;
+		this._ResizeBar.style.left = ( docX - this._ResizeBar.offsetWidth / 2 ) + "px" ;
 	},
 	"_ShowResizeBar" : function( w, table, mouse )
 	{
-		if ( FCKDragTableHandler._ResizeBar == null )
-		{
-			FCKDragTableHandler._ResizeBar = document.createElement( "div" ) ;
-			var paddingBar = FCKDragTableHandler._ResizeBar ;
+		if ( this._ResizeBar == null )
+		{
+			this._ResizeBar = document.createElement( "div" ) ;
+			var paddingBar = this._ResizeBar ;
 			paddingBar.style.position = "absolute" ;
 			paddingBar.style.cursor = "e-resize" ;
@@ -409,8 +410,8 @@
 				paddingBar.style.opacity = 0.10 ;
 			document.body.appendChild( paddingBar ) ;
-			FCKTools.AddEventListener( paddingBar, "mousemove", FCKDragTableHandler._ResizeBarMouseMoveListener ) ;
-			FCKTools.AddEventListener( paddingBar, "mousedown", FCKDragTableHandler._ResizeBarMouseDownListener ) ;
-			FCKTools.AddEventListener( document, "mouseup", FCKDragTableHandler._ResizeBarMouseUpListener ) ;
-			FCKTools.AddEventListener( FCK.EditorDocument, "mouseup", FCKDragTableHandler._ResizeBarMouseUpListener ) ;
+			FCKTools.AddEventListener( paddingBar, "mousemove", this._ResizeBarMouseMoveListener ) ;
+			FCKTools.AddEventListener( paddingBar, "mousedown", this._ResizeBarMouseDownListener ) ;
+			FCKTools.AddEventListener( document, "mouseup", this._ResizeBarMouseUpListener ) ;
+			FCKTools.AddEventListener( FCK.EditorDocument, "mouseup", this._ResizeBarMouseUpListener ) ;
 
 			// IE doesn't let the tranparent part of the padding block to receive mouse events unless there's something inside.
@@ -418,5 +419,5 @@
 			var filler = document.createElement( "img" ) ;
 			filler.border = 0 ;
-			filler.src = FCKConfig.EditorPath + "/editor/images/spacer.gif" ;
+			filler.src = FCKConfig.BasePath + "images/spacer.gif" ;
 			filler.style.position = "absolute" ;
 			paddingBar.appendChild( filler ) ;
@@ -436,11 +437,11 @@
 		}
 
-		var paddingBar = FCKDragTableHandler._ResizeBar ;
+		var paddingBar = this._ResizeBar ;
 		if ( FCKBrowserInfo.IsIE )
 			paddingBar.filters.item("DXImageTransform.Microsoft.Alpha").opacity = 10 ;
 		else
 			paddingBar.style.opacity = 0.1 ;
-		var offset = FCKDragTableHandler._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
-		var tablePos = FCKDragTableHandler._GetWindowPosition( w, table ) ;
+		var offset = this._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+		var tablePos = this._GetWindowPosition( w, table ) ;
 		var barHeight = table.offsetHeight ;
 		var barTop = offset.y + tablePos.y ;
@@ -461,5 +462,5 @@
 		var barWidth = Math.max( bw+100, cs+100 ) ;
 		paddingBar.style.width = barWidth + "px" ;
-		paddingBar.style.left = ( offset.x + mouse.x + FCKDragTableHandler._GetWindowScrollX( w ) - barWidth / 2 ) +  "px" ;
+		paddingBar.style.left = ( offset.x + mouse.x + this._GetWindowScrollX( w ) - barWidth / 2 ) +  "px" ;
 		var filler = paddingBar.getElementsByTagName( "img" )[0] ;
 		filler.style.width = paddingBar.offsetWidth + "px" ;
@@ -484,10 +485,10 @@
 	"_HideResizeBar" : function()
 	{
-		if ( FCKDragTableHandler._ResizeBar )
+		if ( this._ResizeBar )
 		{
 			// IE bug: display : none does not hide the resize bar for some reason.
 			// so set the position to somewhere invisible.
-			FCKDragTableHandler._ResizeBar.style.top = "-100000px" ;
-			FCKDragTableHandler._ResizeBar.style.left = "-100000px" ;
+			this._ResizeBar.style.top = "-100000px" ;
+			this._ResizeBar.style.left = "-100000px" ;
 		}
 	}