Merge branch 't/12747'

ckeditor · Dec 11, 2014 · 69263d0 · 69263d0
2 parents c5ed166 + dff68f1
commit 69263d0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,10 @@ CKEditor 4 Changelog
 
 ## CKEditor 4.4.7
 
+Fixed Issues:
+
+* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when editor is maximized results in incorrect drop-down panel position.
+
 ## CKEditor 4.4.6
 
 **Security Updates:**

diff --git a/core/dom/element.js b/core/dom/element.js
@@ -1425,9 +1425,9 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
 				}
 
 				if ( needAdjustScrollAndBorders ) {
-					x = box.left + ( !quirks && $docElem.scrollLeft || body.$.scrollLeft );
+					x = box.left + ( quirks ? body.$.scrollLeft : $docElem.scrollLeft );
 					x -= clientLeft;
-					y = box.top + ( !quirks && $docElem.scrollTop || body.$.scrollTop );
+					y = box.top + ( quirks ? body.$.scrollTop : $docElem.scrollTop );
 					y -= clientTop;
 				}
 			} else {

diff --git a/tests/tickets/12747/1.html b/tests/tickets/12747/1.html
@@ -0,0 +1,11 @@
+<p>Some text</p>
+<p>Some text</p>
+<p>Some text</p>
+<textarea id="editor1">
+	<p>Foo</p>
+	<p>Bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar bar</p>
+</textarea>
+
+<script>
+	CKEDITOR.replace( 'editor1' );
+</script>
diff --git a/tests/tickets/12747/1.md b/tests/tickets/12747/1.md
@@ -0,0 +1,19 @@
+@bender-tags: 4.4.7, tc
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, maximize, floatingspace, font
+
+Note:
+
+* Related bug was reproducible on IE8-10 only.
+* Make the selection precisely.
+
+Steps:
+
+1. Click the Maximize button.
+1. Using your mouse select text:
+  * Start **right above** "Foo".
+  * Finish below the second line.
+  * This should result in selecting the entire content.
+1. Click the Font dropdown.
+
+**Expected result**: Dropdown panel is visible and correctly positioned.