Ticket #1769: 1769.patch

editor/_source/classes/fckpanel.js

@@ -217 +217 @@
                                 relElement ) ;
 
                 // Minus the offsets provided by any positioned parent element of the panel iframe.
-                var positionedAncestor = FCKDomTools.GetPositionedAncestor( FCKTools.GetElementWindow( this._IFrame ), this._IFrame.parentNode ) ;
+                var positionedAncestor = FCKDomTools.GetPositionedAncestor( this._IFrame.parentNode ) ;
                 if ( positionedAncestor )
                 {
                         var nPos = FCKTools.GetDocumentPosition( FCKTools.GetElementWindow( positionedAncestor ), positionedAncestor ) ;

editor/_source/internals/fckdomtools.js

@@ -924 +924 @@
                         style[ styleName ] = styleDict[ styleName ] ;
         },
 
-        GetCurrentElementStyle : function( w, element, attrName )
+        GetCurrentElementStyle : function( element, propertyName )
         {
                 if ( FCKBrowserInfo.IsIE )
-                        return element.currentStyle[attrName] ;
+                        return element.currentStyle[ propertyName ] ;
                 else
-                        return w.getComputedStyle( element, '' )[attrName] ;
+                        return element.ownerDocument.defaultView.getComputedStyle( element, '' ).getPropertyValue( propertyName ) ;
         },
 
-        GetPositionedAncestor : function( w, element )
+        GetPositionedAncestor : function( element )
         {
                 var currentElement = element ;
                 while ( currentElement != FCKTools.GetElementDocument( currentElement ).documentElement )
                 {
-                        if ( this.GetCurrentElementStyle( w, currentElement, 'position' ) != 'static' )
+                        if ( this.GetCurrentElementStyle( currentElement, 'position' ) != 'static' )
                                 return currentElement ;
                         currentElement = currentElement.parentNode ;
                 }
@@ -966 +966 @@
                         // Consider the margin in the scroll, which is ok for our current
                         // needs, but needs investigation if we will be using this function
                         // in other places.
-                        offset += parseInt( this.GetCurrentElementStyle( window, element, 'marginBottom' ) || 0, 10 ) ;
+                        offset += parseInt( this.GetCurrentElementStyle( element, 'marginBottom' ) || 0, 10 ) ;
                 }
 
                 // Appends the offsets for the entire element hierarchy.

editor/_source/internals/fcktools.js

@@ -462 +462 @@
         // 1. It matters if document.body itself is a positioned element;
         // 2. It matters is when we're in IE and the element has no positioned ancestor.
         // Otherwise the values should be ignored.
-        if ( FCKDomTools.GetCurrentElementStyle( w, w.document.body, 'position') != 'static' 
-                        || ( FCKBrowserInfo.IsIE && FCKDomTools.GetPositionedAncestor( w, node ) == null ) )
+        if ( FCKDomTools.GetCurrentElementStyle( w.document.body, 'position') != 'static' 
+                        || ( FCKBrowserInfo.IsIE && FCKDomTools.GetPositionedAncestor( node ) == null ) )
         {
                 x += w.document.body.offsetLeft ;
                 y += w.document.body.offsetTop ;