Changeset 2125

Timestamp:

2008-06-24 13:18:15 (7 months ago)

Author:

fredck

Message:

Merged trunk into branches/versions/2.6.x. Final commit for the release of version 2.6.2 (2nd trial).

Location:

FCKeditor/branches/versions/2.6.x/editor/_source

Files:

• classes/fckstyle.js (modified) (3 diffs)
• internals/fckdialog.js (modified) (2 diffs)

FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckstyle.js

@@ -222 +222 @@
                                                                                                 continue ;
 
+                                                                                        /*jsl:fallthru*/
+
                                                                                 default :
                                                                                         FCKDomTools.RemoveAttribute( pathElement, att ) ;
@@ -374 +376 @@
                                                                                 continue ;
 
+                                                                        /*jsl:fallthru*/
+
                                                                 default :
                                                                         FCKDomTools.RemoveAttribute( currentNode, att ) ;
@@ -546 +550 @@
                                                         if ( FCKDomTools.GetAttributeValue( innerElement, att ) != this.GetFinalAttributeValue( att ) )
                                                                 continue ;
+
+                                                        /*jsl:fallthru*/
 
                                                 default :

FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js

@@ -100 +100 @@
                         var viewSize = FCKTools.GetViewPaneSize( topWindow ) ;
                         var scrollPosition = { 'X' : 0, 'Y' : 0 } ;
-                        if ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 )
-                                FCKTools.GetScrollPosition( topWindow ) ;
+                        var useAbsolutePosition = FCKBrowserInfo.IsIE && ( !FCKBrowserInfo.IsIE7 || !FCKTools.IsStrictMode( topWindow.document ) ) ;
+                        if ( useAbsolutePosition )
+                                scrollPosition = FCKTools.GetScrollPosition( topWindow ) ;
                         var iTop  = Math.max( scrollPosition.Y + ( viewSize.Height - height - 20 ) / 2, 0 ) ;
                         var iLeft = Math.max( scrollPosition.X + ( viewSize.Width - width - 20 )  / 2, 0 ) ;
@@ -117 +118 @@
                         FCKDomTools.SetElementStyles( dialog,
                                         {
-                                                'position'      : ( FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsIE7 ) ? 'absolute' : 'fixed',
+                                                'position'      : ( useAbsolutePosition ) ? 'absolute' : 'fixed',
                                                 'top'           : iTop + 'px',
                                                 'left'          : iLeft + 'px',