Rebase.

CHANGES.md

@@ -1,12 +1,12 @@
-CKEditor 4 Changelog
+CKEditor 4 Changelog
 ====================
 
-<<<<<<< HEAD
 ## CKEditor 4.10
 
 New Features:
 
 * [#1761](https://github.com/ckeditor/ckeditor-dev/issues/1761): [Autolink](https://ckeditor.com/cke4/addon/autolink) plugin supports email links.
+* [#1703](https://github.com/ckeditor/ckeditor-dev/issues/1703): Introduced Mentions plugin providing autocompletition feature for usernames.
 
 Fixed Issues:
 

plugins/autocomplete/plugin.js

@@ -733,7 +733,7 @@
 				frame = this.editor.window.getFrame(),
 				editable = this.editor.editable(),
 				// Bounding rect where view should fit (visible editor viewport).
-				absoluteRect = editable.isInline() ? editable.getAbsoluteClientRect( this.editor ) : frame.getAbsoluteClientRect( this.editor ),
+				absoluteRect = editable.isInline() ? editable.getClientRect( true ) : frame.getClientRect( true ),
 				top;
 
 			// If panel does not fit below the rect and fits above, set it there.

tests/plugins/autocomplete/view.js

@@ -11,7 +11,7 @@
 			name: 'editor2',
 			creator: 'inline'
 		}
-	}
+	};
 
 	bender.test( {
 
@@ -67,11 +67,11 @@
 						return {
 							y: 2,
 							x: 4
-						}
+						};
 					}
-				} )
+				} );
 
-			rect = view.getCaretRect();
+			var rect = view.getCaretRect();
 
 			assert.areEqual( 7, rect.bottom );
 			assert.areEqual( 8, rect.left );
@@ -92,11 +92,11 @@
 						return {
 							y: 2,
 							x: 4
-						}
+						};
 					}
-				} )
+				} );
 
-			rect = view.getCaretRect();
+			var rect = view.getCaretRect();
 
 			assert.areEqual( 7, rect.bottom );
 			assert.areEqual( 8, rect.left );
@@ -233,7 +233,7 @@
 					return { x: config.scrollX };
 				}
 			} ),
-			elementStub = sinon.stub( CKEDITOR.dom.element.prototype, 'getAbsoluteClientRect' ).returns( config.absoluteRect );
+			elementStub = sinon.stub( CKEDITOR.dom.element.prototype, 'getClientRect' ).returns( config.absoluteRect );
 
 		view.append();