Ticket #3545: 3545_2.patch

_source/plugins/floatpanel/plugin.js

@@ -211 +211 @@
                                                                                 iframe.setAttribute( 'title', ' ' );
                                                                         }
                                                                 }
-                                                                iframe.$.contentWindow.focus();
+                                                                if ( CKEDITOR.env.ie && CKEDITOR.env.quirks )
+                                                                        iframe.focus();
+                                                                else
+                                                                        iframe.$.contentWindow.focus();
                                                         }, 0);
                                         }, 0);
 

_source/plugins/menu/plugin.js

@@ -158 +158 @@
                                         element = this._.element = block.element;
                                         element.addClass( editor.skinClass );
                                         element.getDocument().getBody().setStyle( 'overflow', 'hidden' );
+                                        element.getDocument().getElementsByTag('html').getItem(0).setStyle( 'overflow', 'hidden' );
 
                                         this._.itemOverFn = CKEDITOR.tools.addFunction( function( index )
                                                 {

_source/skins/office2003/menu.css

@@ -5 +5 @@
 
 .cke_skin_office2003 .cke_contextmenu
 {
-    padding: 2px;
+        padding: 2px;
 }
 
 .cke_skin_office2003 .cke_menuitem a
@@ -71 +71 @@
     margin-left: 28px;
     background-color: #fff;
         _overflow: hidden;
-        _width: 86px;
+        _width: 80px;
 }
 
 .cke_rtl .cke_skin_office2003 .cke_menuitem .cke_label

_source/skins/v2/menu.css

@@ -5 +5 @@
 
 .cke_skin_v2 .cke_contextmenu
 {
-    padding: 2px;
+        padding: 2px;
 }
 
 .cke_skin_v2 .cke_menuitem a
@@ -71 +71 @@
     margin-left: 28px;
     background-color: #fff;
         _overflow: hidden;
-        _width: 86px;
+        _width: 80px;
 }
 
 .cke_rtl .cke_skin_v2 .cke_menuitem .cke_label

_source/core/dom/element.js

@@ -1 @@
-/*
+/*
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
@@ -1091 +1091 @@
 
                 getDocumentPosition : function( refDocument )
                 {
-                        var x = 0, y = 0, current = this, previous = null;
-                        while ( current && !( current.getName() == 'body' || current.getName() == 'html' ) )
+                        var x = 0, y = 0,
+                                body = this.getDocument().getBody();
+                        if ( document.documentElement["getBoundingClientRect"] ) {
+                                var box  = this.$.getBoundingClientRect(),
+                                        doc = this.getDocument().$,
+                                        docElem = doc.documentElement,
+                                        clientTop = docElem.clientTop || body.$.clientTop || 0,
+                                        clientLeft = docElem.clientLeft || body.$.clientLeft || 0;
+
+                                x = box.left + (!CKEDITOR.env.quirks && docElem.scrollLeft || body.$.scrollLeft);
+                                x -= clientLeft;
+                                y = box.top  + (!CKEDITOR.env.quirks && docElem.scrollTop  || body.$.scrollTop );
+                                y -= clientTop;
+                        }
+                        else
                         {
-                                x += current.$.offsetLeft - current.$.scrollLeft;
-                                y += current.$.offsetTop - current.$.scrollTop;
+                                var current = this, previous = null;
+                                while ( current && !( current.getName() == 'body' || current.getName() == 'html' ) )
+                                {
+                                        x += current.$.offsetLeft - current.$.scrollLeft;
+                                        y += current.$.offsetTop - current.$.scrollTop;
 
-                                if ( !CKEDITOR.env.opera )
-                                {
-                                        // Opera includes clientTop|Left into offsetTop|Left.
-                                        if ( !current.equals( this ) )
+                                        if ( !CKEDITOR.env.opera )
                                         {
-                                                x += ( current.$.clientLeft || 0 );
-                                                y += ( current.$.clientTop || 0 );
+                                                // Opera includes clientTop|Left into offsetTop|Left.
+                                                if ( !current.equals( this ) )
+                                                {
+                                                        x += ( current.$.clientLeft || 0 );
+                                                        y += ( current.$.clientTop || 0 );
+                                                }
+
+                                                var scrollElement = previous;
+                                                while ( scrollElement && !scrollElement.equals( current ) )
+                                                {
+                                                        x -= scrollElement.$.scrollLeft;
+                                                        y -= scrollElement.$.scrollTop;
+                                                        scrollElement = scrollElement.getParent();
+                                                }
                                         }
 
-                                        var scrollElement = previous;
-                                        while ( scrollElement && !scrollElement.equals( current ) )
-                                        {
-                                                x -= scrollElement.$.scrollLeft;
-                                                y -= scrollElement.$.scrollTop;
-                                                scrollElement = scrollElement.getParent();
-                                        }
+                                        previous = current;
+                                        current = new CKEDITOR.dom.element( current.$.offsetParent );
                                 }
-
-                                previous = current;
-                                current = new CKEDITOR.dom.element( current.$.offsetParent );
                         }
 
                         if ( refDocument )
                         {
-                                var currentWindow = current.getWindow(),
+                                var currentWindow = this.getWindow(),
                                         refWindow = refDocument.getWindow();
 
                                 if ( !currentWindow.equals( refWindow ) && currentWindow.$.frameElement )
@@ -1133 +1150 @@
                                 }
                         }
 
-                        var body = this.getDocument().getBody();
-
                         // document.body is a special case when it comes to offsetTop and offsetLeft
                         // values.
                         // 1. It does not matter if we're in IE Quirks mode - in this case body is