Changeset 1384

Timestamp:

2008-01-22 16:08:28 (6 months ago)

Author:

fredck

Message:

Fixed #1769 : Improvements to FCKDomTools.GetCurrentElementStyle

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckpanel.js (modified) (1 diff)
• internals/fckdomtools.js (modified) (3 diffs)
• internals/fcktools.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckpanel.js

@@ -218 +218 @@
 
                 // 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 )
                 {

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

@@ -925 +925 @@
         },
 
-        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] ;
-        },
-
-        GetPositionedAncestor : function( w, element )
+                        return element.ownerDocument.defaultView.getComputedStyle( element, '' ).getPropertyValue( propertyName ) ;
+        },
+
+        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 ;
@@ -967 +967 @@
                         // 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 ) ;
                 }
 
@@ -984 +984 @@
 
 
+

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

@@ -463 +463 @@
         // 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 ;