Ticket #6146: 6146.patch

_source/core/dom/element.js

@@ -1219 +1219 @@
                         return null;
                 },
 
-                getDocumentPosition : function( refDocument )
+                getDocumentPosition : function( refDocument, ignoreXScrolling )
                 {
                         var x = 0, y = 0,
-                                body = this.getDocument().getBody(),
-                                quirks = this.getDocument().$.compatMode == 'BackCompat';
+                                doc = this.getDocument(),
+                                body = doc.getBody(),
+                                quirks = doc.$.compatMode == 'BackCompat';
 
-                        var doc = this.getDocument();
 
                         if ( document.documentElement[ "getBoundingClientRect" ] )
                         {
@@ -1257 +1257 @@
 
                                 if ( needAdjustScrollAndBorders )
                                 {
-                                        x = box.left + ( !quirks && $docElem.scrollLeft || body.$.scrollLeft );
+                                        x = box.left;
+                                        // The scrolling addition might cause problems (#6146).
+                                        if ( !CKEDITOR.env.ie || ( ignoreXScrolling && CKEDITOR.env.ie ) )
+                                                x += ( !quirks && $docElem.scrollLeft || body.$.scrollLeft );
                                         x -= clientLeft;
                                         y = box.top  + ( !quirks && $docElem.scrollTop || body.$.scrollTop );
                                         y -= clientTop;

_source/plugins/floatpanel/plugin.js

@@ -16 +16 @@
         function getPanel( editor, doc, parentElement, definition, level )
         {
                 // Generates the panel key: docId-eleId-skinName-langDir[-uiColor][-CSSs][-level]
-                var key =
-                        doc.getUniqueId() +
-                        '-' + parentElement.getUniqueId() +
-                        '-' + editor.skinName +
-                        '-' + editor.lang.dir +
-                        ( ( editor.uiColor && ( '-' + editor.uiColor ) ) || '' ) +
-                        ( ( definition.css && ( '-' + definition.css ) ) || '' ) +
-                        ( ( level && ( '-' + level ) ) || '' );
+                var key = CKEDITOR.tools.genKey( doc.getUniqueId(), parentElement.getUniqueId(), editor.skinName,
+                                                editor.lang.dir, editor.uiColor || '', definition.css || '', level || '' );
 
                 var panel = panels[ key ];
 
@@ -98 +92 @@
                                         3 = bottom-left
                                         4 = bottom-right
                          */
-                        showBlock : function( name, offsetParent, corner, offsetX, offsetY )
+                        showBlock : function( name, offsetParent, corner, offsetX, offsetY, ignoreXScrolling )
                         {
                                 var panel = this._.panel,
                                         block = panel.showBlock( name );
@@ -109 +103 @@
                                 var element = this.element,
                                         iframe = this._.iframe,
                                         definition = this._.definition,
-                                        position = offsetParent.getDocumentPosition( element.getDocument() ),
+                                        position = offsetParent.getDocumentPosition( element.getDocument(), ignoreXScrolling ),
                                         rtl = this._.dir == 'rtl';
 
                                 var left        = position.x + ( offsetX || 0 ),

_source/plugins/panelbutton/plugin.js

@@ -36 +36 @@
                         return;
                 }
 
-                _.panel.showBlock( this._.id, this.document.getById( this._.id ), 4 );
+                _.panel.showBlock( this._.id, this.document.getById( this._.id ), 4, 0, 0, 1 );
         };