Changeset 487

Timestamp:

2007-07-20 12:58:11 (17 months ago)

Author:

martinkou

Message:

Deleted _GetWindowScrollX() and _GetWindowScrollY() from dragresizetable plugin, since those two functions exist in FCKTools already.
Refactored _GetDocumentPosition() and _GetWindowPosition() from dragresizetable plugin to core, since they are now used by core components.
Fixed #174 : Incorrect positioning of FCKeditor widget in full screen mode.

Location:

FCKeditor/trunk/editor

Files:

• plugins/dragresizetable/fckplugin.js (modified) (11 diffs)
• _source/commandclasses/fckfitwindow.js (modified) (1 diff)
• _source/internals/fcktools.js (modified) (1 diff)

FCKeditor/trunk/editor/plugins/dragresizetable/fckplugin.js

@@ -10 +10 @@
         "_MaximumX" : null,
         "_LastX" : null,
-        "_GetWindowScrollX" : function( w )
-        {
-                var scrollX = 0 ;
-                if ( w.document.documentElement && w.document.documentElement.scrollLeft ) 
-                        scrollX = w.document.documentElement.scrollLeft ;
-                else if ( w.document.body && w.document.body.scrollLeft )
-                        scrollX = w.document.body.scrollLeft ;
-                else if ( w.scrollX )
-                        scrollX = w.scrollX ;
-                return scrollX ;
-        },
-        "_GetWindowScrollY" : function( w )
-        {
-                var scrollY = 0 ;
-                if ( w.document.documentElement && w.document.documentElement.scrollTop )
-                        scrollY = w.document.documentElement.scrollTop ;
-                else if ( w.document.body && w.document.body.scrollTop )
-                        scrollY = w.document.body.scrollTop ;
-                else if ( w.scrollY )
-                        scrollY = w.scrollY ;
-                return scrollY ;
-        },
-        "_GetDocumentPosition" : function( w, node )
-        {
-                var x = 0 ;
-                var y = 0 ;
-                var curNode = node ;
-                while ( curNode && curNode != w.document.body )
-                {
-                        x += curNode.offsetLeft - curNode.scrollLeft ;
-                        y += curNode.offsetTop - curNode.scrollTop ;
-                        curNode = curNode.offsetParent ;
-                }
-                return { "x" : x, "y" : y } ;
-        },
-        "_GetWindowPosition" : function( w, node )
-        {
-                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 = this._GetWindowPosition( w, domNode ) ; 
+                var myCoords = FCKTools.GetWindowPosition( w, domNode ) ; 
                 var xMin = myCoords.x ;
                 var yMin = myCoords.y ;
@@ -85 +43 @@
                 for ( var i = 0 ; i < cells.length ; i++ )
                 {
-                        var pos = this._GetWindowPosition( w, cells[i] ) ;
+                        var pos = FCKTools.GetWindowPosition( w, cells[i] ) ;
                         var rightX = pos.x + parseInt( cells[i].clientWidth ) ;
                         var rxDist = mouse.x - rightX ;
@@ -105 +63 @@
 
                 // Abort if too far from the border.
-                lxDist = mouse.x - this._GetWindowPosition( w, lbCell ).x ;
+                lxDist = mouse.x - FCKTools.GetWindowPosition( w, lbCell ).x ;
                 if ( lxDist < 0 && minRxDist < 0 && minRxDist < -2 )
                         return null ; 
@@ -140 +98 @@
                 // Calculate maximum and minimum x-coordinate delta.
                 var borderIndex = FCKDragTableHandler._GetResizeBarPosition() ;
-                var offset = FCKDragTableHandler._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+                var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
                 var table = FCKTools.GetElementAscensor( FCKDragTableHandler._LeftCell, "table" );
                 var minX = null ;
@@ -151 +109 @@
                         {
                                 var cell = row.cells.item( c ) ;
-                                var cellPosition = FCKDragTableHandler._GetWindowPosition( FCK.EditorWindow, cell ) ;
+                                var cellPosition = FCKTools.GetWindowPosition( FCK.EditorWindow, cell ) ;
                                 var cellPadding = FCKDragTableHandler._GetCellPadding( table, cell ) ;
                                 var cellMinX = cellPosition.x + cellPadding ;
@@ -365 +323 @@
                 if ( node.ownerDocument == document )
                 {
-                        var offset = this._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+                        var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
                         mouseX -= offset.x ;
                         mouseY -= offset.y ;
@@ -373 +331 @@
                 if ( this._ResizeBar && this._LeftCell )
                 {
-                        var leftPos = this._GetWindowPosition( FCK.EditorWindow, this._LeftCell ) ;
-                        var rightPos = this._GetWindowPosition( FCK.EditorWindow, this._RightCell ) ; 
+                        var leftPos = FCKTools.GetWindowPosition( FCK.EditorWindow, this._LeftCell ) ;
+                        var rightPos = FCKTools.GetWindowPosition( FCK.EditorWindow, this._RightCell ) ; 
                         var rxDist = mouseX - ( leftPos.x + this._LeftCell.clientWidth ) ;
                         var lxDist = mouseX - rightPos.x ;
@@ -427 +385 @@
                 if ( node.ownerDocument == FCK.EditorDocument )
                 {
-                        var offset = this._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+                        var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
                         mouse.x += offset.x ;
                         mouse.y += offset.y ;
@@ -438 +396 @@
                         mouse.x = this._MinimumX + 5 ;
 
-                var docX = mouse.x + this._GetWindowScrollX( window ) ;
+                var docX = mouse.x + FCKTools.GetScrollPosition( window ).X ;
                 this._ResizeBar.style.left = ( docX - this._ResizeBar.offsetWidth / 2 ) + "px" ;
                 this._LastX = mouse.x ;
@@ -487 +445 @@
                 else
                         paddingBar.style.opacity = 0.1 ;
-                var offset = this._GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
-                var tablePos = this._GetWindowPosition( w, table ) ;
+                var offset = FCKTools.GetDocumentPosition( window, FCK.EditingArea.IFrame ) ;
+                var tablePos = FCKTools.GetWindowPosition( w, table ) ;
                 var barHeight = table.offsetHeight ;
                 var barTop = offset.y + tablePos.y ;
@@ -507 +465 @@
                 var barWidth = Math.max( bw+100, cs+100 ) ;
                 paddingBar.style.width = barWidth + "px" ;
-                paddingBar.style.left = ( offset.x + mouse.x + this._GetWindowScrollX( w ) - barWidth / 2 ) +  "px" ;
+                paddingBar.style.left = ( offset.x + mouse.x + FCKTools.GetScrollPosition( w ).X - barWidth / 2 ) +  "px" ;
                 var filler = paddingBar.getElementsByTagName( "img" )[0] ;
                 filler.style.width = paddingBar.offsetWidth + "px" ;

FCKeditor/trunk/editor/_source/commandclasses/fckfitwindow.js

@@ -103 +103 @@
                 eMainWindow.scrollTo(0, 0);
 
+                // Is the editor still not on the top left? Let's find out and fix that as well. (Bug #174)
+                var editorPos = FCKTools.GetWindowPosition( eMainWindow, eEditorFrame ) ;
+                if ( editorPos.x != 0 )
+                        eEditorFrameStyle.left = ( -1 * editorPos.x ) + "px" ;
+                if ( editorPos.y != 0 )
+                        eEditorFrameStyle.top = ( -1 * editorPos.y ) + "px" ;
+
                 this.IsMaximized = true ;
         }

FCKeditor/trunk/editor/_source/internals/fcktools.js

@@ -446 +446 @@
         return output.join( "" ) ;
 }
+
+FCKTools.GetDocumentPosition = function( w, node )
+{
+        var x = 0 ;
+        var y = 0 ;
+        var curNode = node ;
+        while ( curNode && curNode != w.document.body )
+        {
+                x += curNode.offsetLeft - curNode.scrollLeft ;
+                y += curNode.offsetTop - curNode.scrollTop ;
+                curNode = curNode.offsetParent ;
+        }
+        return { "x" : x, "y" : y } ;
+}
+
+FCKTools.GetWindowPosition = function( w, node )
+{
+        var pos = this.GetDocumentPosition( w, node ) ;
+        var scroll = FCKTools.GetScrollPosition( w ) ;
+        pos.x -= scroll.X ;
+        pos.y -= scroll.Y ;
+        return pos ;
+}