Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js (revision 1359)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js (revision 1360)
@@ -947,15 +947,19 @@
{
var currentElement = element ;
+
while ( currentElement != FCKTools.GetElementDocument( currentElement ).documentElement )
{
var currentWindow = FCKTools.GetElementWindow( currentElement ) ;
+
if ( this.GetCurrentElementStyle( currentWindow, currentElement, 'position' ) != 'static' )
return currentElement ;
- if ( currentElement == FCKTools.GetElementDocument( currentElement ).documentElement &&
- currentWindow != w )
+
+ if ( currentElement == FCKTools.GetElementDocument( currentElement ).documentElement
+ && currentWindow != w )
currentElement = currentWindow.frameElement ;
else
currentElement = currentElement.parentNode ;
}
+
return null ;
},
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js (revision 1359)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js (revision 1360)
@@ -612,5 +612,5 @@
/**
- * Utility function for binding the "this" reference to an object for a function.
+ * Binding the "this" reference to an object for a function.
*/
FCKTools.Bind = function( subject, func )
@@ -620,7 +620,8 @@
/**
- * Retrieve the correct "empty iframe" URL for the current browser, which causes the
- * minimum fuzz (e.g. security warnings in HTTPS, DNS error in IE5.5, etc.) for that
- * browser, but updates the iframe.
+ * Retrieve the correct "empty iframe" URL for the current browser, which
+ * causes the minimum fuzz (e.g. security warnings in HTTPS, DNS error in
+ * IE5.5, etc.) for that browser, making the iframe ready to DOM use whithout
+ * having to loading an external file.
*/
FCKTools.GetVoidUrl = function()
@@ -629,17 +630,17 @@
return "javascript: void( function(){" +
"document.open();" +
- "document.write('');" +
+ "document.write('');" +
"document.domain = '" + FCK_RUNTIME_DOMAIN + "';" +
"document.close();" +
"}() ) ;";
+
if ( FCKBrowserInfo.IsIE )
{
- if ( FCKBrowserInfo.IsIE7 ) // IE7+
- return "" ;
- else if ( FCKBrowserInfo.IsIE6 ) // IE6+
- return "javascript: '';" ;
- else // IE5.5
- return "";
- }
- return "javascript: void(0);" ;
-}
+ if ( FCKBrowserInfo.IsIE7 || !FCKBrowserInfo.IsIE6 )
+ return "" ; // IE7+ / IE5.5
+ else
+ return "javascript: '';" ; // IE6+
+ }
+
+ return "javascript: void(0);" ; // All other browsers.
+}