From 2e9c854a2419216d63263ffdd113cafbe516b284 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 13 Sep 2018 14:52:18 +0200
Subject: [PATCH 01/77] Tests: Added manual test.

---
 tests/plugins/dialog/manual/inputfocus.html | 12 +++++++
 tests/plugins/dialog/manual/inputfocus.md   | 37 +++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 tests/plugins/dialog/manual/inputfocus.html
 create mode 100644 tests/plugins/dialog/manual/inputfocus.md

diff --git a/tests/plugins/dialog/manual/inputfocus.html b/tests/plugins/dialog/manual/inputfocus.html
new file mode 100644
index 00000000000..e2ab1a44332
--- /dev/null
+++ b/tests/plugins/dialog/manual/inputfocus.html
@@ -0,0 +1,12 @@
+<style>
+	.spacer {
+		height: 2000px;
+	}
+</style>
+<div class="spacer"></div>
+<textarea id="editor"></textarea>
+<div class="spacer"></div>
+
+<script>
+	CKEDITOR.replace( 'editor' );
+</script>
diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
new file mode 100644
index 00000000000..5b47992e264
--- /dev/null
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -0,0 +1,37 @@
+@bender-tags: 2395, bug, 4.10.2
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, link
+
+1. Scroll down until editor is visible.
+1. Press link button.
+
+## Things to check:
+
+### Touch devices:
+
+- Play around focusing and blurring inputs, zooming and scrolling page.
+
+#### Expected:
+
+- When opening dialog or focusing input caret page should be scrolled in a way caret is visible.
+
+#### Unexpected
+
+- Caret is outside of current viewport.
+
+### Desktop computers:
+
+- Resize browser window.
+- Resize dialog window.
+- Drag dialog window.
+- Close and reopen dialog.
+
+#### Expected:
+
+- When dialog is shown scrollbars are invisible.
+- When resizing browser window dialog is still horizontally and vertically centered.
+- When window too small to fit dialog window scrollbars should appear allowing to scroll dialog.
+- Dialog window can be resized and dragged around.
+- When closing and reopening dialog it has same size and position as it had before when it was closed.
+
+Note: When you reposition dialog it won't be centered when resizing browser window.

From 5a03d34a2b22ef54315cde491b97e05855f2dd63 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 13 Sep 2018 15:16:23 +0200
Subject: [PATCH 02/77] Fixed: focusing dialogs input moves scrolls input
 outside of viewport.

Reworked how dialog is styled.
Dialog wrapper now has fixed position with width and height set to 100%.
When dialog is shown body gets class with 'overflow:hidden', and right padding calculated from width of scrollbar.
In all browsers dialog is centered with only CSS. In IE it is centered via absolute position calculated by script.
When dialog is is dragged it becomes absolute positioned.
---
 plugins/dialog/plugin.js    | 89 ++++++++++++++++++++++++++++---------
 skins/moono-lisa/dialog.css | 24 +++++++---
 2 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index c2d034b5f49..2d30f6548ce 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -135,7 +135,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		input && input.removeAttribute( 'aria-invalid' );
 	}
 
-	var templateSource = '<div class="cke_reset_all {editorId} {editorDialogClass} {hidpi}' +
+	var templateSource = '<div class="cke_reset_all cke_dialog_container {editorId} {editorDialogClass} {hidpi}' +
 		'" dir="{langDir}"' +
 		' lang="{langCode}"' +
 		' role="dialog"' +
@@ -281,7 +281,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		// Set the startup styles for the dialog, avoiding it enlarging the
 		// page size on the dialog creation.
 		var startStyles = {
-			position: CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed',
+			position: CKEDITOR.env.ie6Compat ? 'absolute' : 'static',
 			top: 0,
 			visibility: 'hidden'
 		};
@@ -783,10 +783,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		 */
 		move: function( x, y, save ) {
 
-			// The dialog may be fixed positioned or absolute positioned. Ask the
-			// browser what is the current situation first.
 			var element = this._.element.getFirst(), rtl = this._.editor.lang.dir == 'rtl';
-			var isFixed = element.getComputedStyle( 'position' ) == 'fixed';
 
 			// (https://dev.ckeditor.com/ticket/8888) In some cases of a very small viewport, dialog is incorrectly
 			// positioned in IE7. It also happens that it remains sticky and user cannot
@@ -799,19 +796,12 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			if ( CKEDITOR.env.ie )
 				element.setStyle( 'zoom', '100%' );
 
-			if ( isFixed && this._.position && this._.position.x == x && this._.position.y == y )
+			if ( this._.position && this._.position.x == x && this._.position.y == y )
 				return;
 
 			// Save the current position.
 			this._.position = { x: x, y: y };
 
-			// If not fixed positioned, add scroll position to the coordinates.
-			if ( !isFixed ) {
-				var scrollPosition = CKEDITOR.document.getWindow().getScrollPosition();
-				x += scrollPosition.x;
-				y += scrollPosition.y;
-			}
-
 			// Translate coordinate for RTL.
 			if ( rtl ) {
 				var dialogSize = this.getSize(), viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize();
@@ -925,7 +915,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			CKEDITOR.tools.setTimeout( function() {
 				this.layout();
-				resizeWithWindow( this );
+				if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
+					resizeWithWindow( this );
+				}
 
 				this.parts.dialog.setStyle( 'visibility', '' );
 
@@ -954,23 +946,41 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		 */
 		layout: function() {
 			var el = this.parts.dialog;
-			var dialogSize = this.getSize();
-			var win = CKEDITOR.document.getWindow(),
-					viewSize = win.getViewPaneSize();
 
-			var posX = ( viewSize.width - dialogSize.width ) / 2,
+			if ( !this._.moved && ( !CKEDITOR.env.ie || CKEDITOR.env.edge ) ) {
+				el.removeStyle( 'position' );
+				el.setStyle( 'margin', 'auto' );
+
+				return el.getParent().setStyle( 'display', 'flex' );
+			}
+
+			var dialogSize = this.getSize(),
+				win = CKEDITOR.document.getWindow(),
+				viewSize = win.getViewPaneSize(),
+				posX, posY;
+
+			if ( this._.moved && this._.position ) {
+				posX = this._.position.x;
+				posY = this._.position.y;
+			} else {
+				posX = ( viewSize.width - dialogSize.width ) / 2;
 				posY = ( viewSize.height - dialogSize.height ) / 2;
+			}
 
 			// Switch to absolute position when viewport is smaller than dialog size.
 			if ( !CKEDITOR.env.ie6Compat ) {
 				if ( dialogSize.height + ( posY > 0 ? posY : 0 ) > viewSize.height || dialogSize.width + ( posX > 0 ? posX : 0 ) > viewSize.width ) {
-					el.setStyle( 'position', 'absolute' );
+					el.setStyles( {
+						position: 'static',
+						margin: 'auto'
+					} );
 				} else {
-					el.setStyle( 'position', 'fixed' );
+					el.setStyle( 'position', 'absolute' );
+					el.removeStyle( 'margin' );
 				}
 			}
 
-			this.move( this._.moved ? this._.position.x : posX, this._.moved ? this._.position.y : posY );
+			this.move( posX, posY );
 		},
 
 		/**
@@ -1967,6 +1977,17 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 
 		dialog.parts.title.on( 'mousedown', function( evt ) {
+			if ( !dialog._.moved ) {
+				var container = dialog._.element,
+					element = container.getFirst();
+
+				element.setStyle( 'position', 'absolute' );
+				container.removeStyle( 'display' );
+
+				dialog._.moved = true;
+				dialog.layout();
+			}
+
 			lastCoords = { x: evt.data.$.screenX, y: evt.data.$.screenY };
 
 			CKEDITOR.document.on( 'mousemove', mouseMoveHandler );
@@ -2107,6 +2128,29 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		ev.data.preventDefault( 1 );
 	}
 
+	var document = CKEDITOR.document,
+		body = document.getBody(),
+		scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth,
+		paddingRight = CKEDITOR.tools.convertToPx( body.getComputedStyle[ 'padding-right' ] );
+
+	function handleBodyStyles( dialogOpen ) {
+		if ( dialogOpen ) {
+			body.addClass( 'cke_dialog_open' );
+
+			if ( !paddingRight && scrollBarWidth ) {
+				// Add right padding, to prevent from resizing elements, when scrollbars are gone.
+				// Don't do anything, when there is any padding on body element, to not break things.
+				body.setStyle( 'padding-right', scrollBarWidth + 'px' );
+			}
+		} else {
+			body.removeClass( 'cke_dialog_open' );
+
+			if ( !paddingRight && scrollBarWidth ) {
+				body.removeStyle( 'padding-right' );
+			}
+		}
+	}
+
 	function showCover( editor ) {
 		var win = CKEDITOR.document.getWindow(),
 			config = editor.config,
@@ -2117,6 +2161,8 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			coverKey = CKEDITOR.tools.genKey( backgroundColorStyle, backgroundCoverOpacity, baseFloatZIndex ),
 			coverElement = covers[ coverKey ];
 
+		handleBodyStyles( true );
+
 		if ( !coverElement ) {
 			var html = [
 				'<div tabIndex="-1" style="position: ', ( CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed' ),
@@ -2222,6 +2268,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	}
 
 	function hideCover( editor ) {
+		handleBodyStyles();
 		if ( !currentCover )
 			return;
 
diff --git a/skins/moono-lisa/dialog.css b/skins/moono-lisa/dialog.css
index 1e13fa70e7b..657ebba4c6c 100644
--- a/skins/moono-lisa/dialog.css
+++ b/skins/moono-lisa/dialog.css
@@ -52,6 +52,7 @@ Comments in this file will give more details about each of the above blocks.
 {
 	z-index: 1;
 	background: #fff;
+	postition: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */
@@ -135,7 +136,7 @@ Comments in this file will give more details about each of the above blocks.
 	background-color: #fff;
 	overflow: auto;
 	padding: 15px 10px 5px 10px;
-	margin-top: 43px;
+	margin-top: 1px;
 	border-top: 1px solid #d1d1d1;
 }
 
@@ -209,16 +210,14 @@ The .cke_dialog_tab_selected class is appended to the active tab.
 {
 	height: 33px;
 	display: inline-block;
-	margin: 9px 0 0;
-	position: absolute;
+	margin: 9px 0 0 11px;
 	z-index: 2;
-	left: 11px;
 }
 
 .cke_rtl .cke_dialog_tabs
 {
 	left: auto;
-	right: 11px;
+	margin-right: 11px;
 }
 
 /* A single tab (an <a> element). */
@@ -1158,3 +1157,18 @@ a.cke_dialog_ui_button.cke_dialog_image_browse
 	border: 2px solid #139FF7;
 	padding: 6px;
 }
+
+.cke_dialog_open {
+	overflow: hidden;
+}
+
+.cke_dialog_container {
+	position: fixed;
+	overflow-y: auto;
+	overflow-x: auto;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	z-index: 10010;
+}

From b283fb91540dee4df14b2a81a5d187998cb09b6e Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 13 Sep 2018 15:30:15 +0200
Subject: [PATCH 03/77] Fixed type error on IE8

---
 plugins/dialog/plugin.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 2d30f6548ce..3790985f51b 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2129,11 +2129,19 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	}
 
 	var document = CKEDITOR.document,
-		body = document.getBody(),
-		scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth,
-		paddingRight = CKEDITOR.tools.convertToPx( body.getComputedStyle[ 'padding-right' ] );
+		body,
+		scrollBarWidth,
+		paddingRight;
 
 	function handleBodyStyles( dialogOpen ) {
+		body = body || document.getBody();
+		scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth;
+		paddingRight = body.getComputedStyle[ 'padding-right' ];
+
+		if ( paddingRight ) {
+			paddingRight.tools.convertToPx( paddingRight );
+		}
+
 		if ( dialogOpen ) {
 			body.addClass( 'cke_dialog_open' );
 

From 99531d5f7b8a02ba93783dc1df2b1ec9ac2dcd3e Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 19 Sep 2018 16:53:29 +0200
Subject: [PATCH 04/77] Refactoring: handleBodyStyles split and renamed into
 showBodyScrollbars and hideBodyScrollbars.

---
 plugins/dialog/plugin.js | 44 +++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 3790985f51b..49c09683291 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2128,34 +2128,32 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		ev.data.preventDefault( 1 );
 	}
 
-	var document = CKEDITOR.document,
-		body,
-		scrollBarWidth,
-		paddingRight;
-
-	function handleBodyStyles( dialogOpen ) {
-		body = body || document.getBody();
-		scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth;
-		paddingRight = body.getComputedStyle[ 'padding-right' ];
+	function hideBodyScrollbars() {
+		var document = CKEDITOR.document,
+			body = document.getBody(),
+			scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth,
+			paddingRight = body.getComputedStyle[ 'padding-right' ];
 
 		if ( paddingRight ) {
 			paddingRight.tools.convertToPx( paddingRight );
 		}
 
-		if ( dialogOpen ) {
-			body.addClass( 'cke_dialog_open' );
+		body.addClass( 'cke_dialog_open' );
 
-			if ( !paddingRight && scrollBarWidth ) {
-				// Add right padding, to prevent from resizing elements, when scrollbars are gone.
-				// Don't do anything, when there is any padding on body element, to not break things.
-				body.setStyle( 'padding-right', scrollBarWidth + 'px' );
-			}
-		} else {
-			body.removeClass( 'cke_dialog_open' );
+		if ( !paddingRight && scrollBarWidth ) {
+			// Add right padding, to prevent from resizing elements, when scrollbars are gone.
+			// Don't do anything, when there is any padding on body element, to not break things.
+			body.setStyle( 'padding-right', scrollBarWidth + 'px' );
+			body.addClass( 'cke_body_extra_padding' );
+		}
+	}
 
-			if ( !paddingRight && scrollBarWidth ) {
-				body.removeStyle( 'padding-right' );
-			}
+	function showBodyScrollbars() {
+		var body = CKEDITOR.document.getBody();
+		body.removeClass( 'cke_dialog_open' );
+
+		if ( body.hasClass( 'cke_body_extra_padding' ) ) {
+			body.removeStyle( 'padding-right' );
 		}
 	}
 
@@ -2169,7 +2167,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			coverKey = CKEDITOR.tools.genKey( backgroundColorStyle, backgroundCoverOpacity, baseFloatZIndex ),
 			coverElement = covers[ coverKey ];
 
-		handleBodyStyles( true );
+		hideBodyScrollbars();
 
 		if ( !coverElement ) {
 			var html = [
@@ -2276,7 +2274,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	}
 
 	function hideCover( editor ) {
-		handleBodyStyles();
+		showBodyScrollbars();
 		if ( !currentCover )
 			return;
 

From df82bdceafd589862bd1b356ae8668e47549d557 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 19 Sep 2018 16:54:03 +0200
Subject: [PATCH 05/77] Fixed scrollbars appearing when resizing dialog.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 49c09683291..14fa7c7a2da 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2022,7 +2022,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			// Shim to help capturing "mousemove" over iframe.
 			if ( iframeDialog ) {
-				dialogCover = CKEDITOR.dom.element.createFromHtml( '<div class="cke_dialog_resize_cover" style="height: 100%; position: absolute; width: 100%;"></div>' );
+				dialogCover = CKEDITOR.dom.element.createFromHtml( '<div class="cke_dialog_resize_cover" style="height: 100%; position: absolute; width: 100%; left:0; top:0;"></div>' );
 				content.append( dialogCover );
 			}
 

From 4116a46be1bf9f8391c3ee0579ce1dd06beed470 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 20 Sep 2018 10:51:00 +0200
Subject: [PATCH 06/77] Fixed issue with extra padding when padding is
 predefined on body.

---
 plugins/dialog/plugin.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 14fa7c7a2da..c2d94aa9f13 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2132,10 +2132,10 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		var document = CKEDITOR.document,
 			body = document.getBody(),
 			scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth,
-			paddingRight = body.getComputedStyle[ 'padding-right' ];
+			paddingRight = body.getComputedStyle( 'padding-right' );
 
 		if ( paddingRight ) {
-			paddingRight.tools.convertToPx( paddingRight );
+			paddingRight = CKEDITOR.tools.convertToPx( paddingRight );
 		}
 
 		body.addClass( 'cke_dialog_open' );
@@ -2154,6 +2154,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 		if ( body.hasClass( 'cke_body_extra_padding' ) ) {
 			body.removeStyle( 'padding-right' );
+			body.removeClass( 'cke_body_extra_padding' );
 		}
 	}
 

From 8165e31eee11b5369eba193a713fe8669d530746 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 20 Sep 2018 12:34:02 +0200
Subject: [PATCH 07/77] Tests: added test.

---
 tests/plugins/dialog/positioning.js | 106 ++++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 tests/plugins/dialog/positioning.js

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
new file mode 100644
index 00000000000..5f261f95042
--- /dev/null
+++ b/tests/plugins/dialog/positioning.js
@@ -0,0 +1,106 @@
+/* bender-tags: editor */
+/* bender-ckeditor-plugins: dialog, link, toolbar */
+
+( function() {
+	'use strict';
+
+	bender.editor = {};
+
+	bender.test( {
+		// When dialog is shown body has overflow hidden from class 'cke_dialog_open'
+		// and right padding equal to the scrollbars width. When there is predefined right padding
+		// it should be preserved. All extra styling is removed on dialog hide (#2395).
+		'test body has hidden scrollbars when dialog is opened': function() {
+			if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
+				assert.ignore();
+			}
+			var bot = this.editorBot,
+				document = CKEDITOR.document,
+				body = document.getBody(),
+				scrollBarWidth;
+
+			body.appendHtml( '<div style="height:4000px"></div>' );
+			scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth;
+
+			bot.dialog( 'link', function( dialog ) {
+				assert.isTrue( body.hasClass( 'cke_dialog_open' ), 'Body should have proper class.' );
+				assert.isTrue( body.hasClass( 'cke_body_extra_padding' ), 'Body should have proper class.' );
+				assert.areSame( scrollBarWidth + 'px', body.getStyle( 'padding-right' ), 'Body should have right padding.' );
+
+				dialog.hide();
+
+				assert.isFalse( body.hasClass( 'cke_dialog_open' ), 'Body shouldn\'t have class.' );
+				assert.areSame( '', body.getStyle( 'padding-right' ), 'Body shouldn\'t have right padding.' );
+
+				body.setStyle( 'padding-right', '1em' );
+
+				bot.dialog( 'link', function( dialog ) {
+					assert.areSame( '1em', body.getStyle( 'padding-right' ), 'Right padding should be preserved on body.' );
+					assert.isFalse( body.hasClass( 'cke_body_extra_padding' ), 'Body shouldn\'t have class.' );
+					dialog.hide();
+
+					assert.areSame( '1em', body.getStyle( 'padding-right' ), 'Right padding should be preserved on body.' );
+				} );
+			} );
+		},
+		// Dialog is initially centered by CSS styles:
+		// When dialog is shown page is covered by fixed dialog container with `display: flex`.
+		// Dialog element doesn't have `position` style, and has `margin: auto` (#2395).
+		'test dialog is initially centered': function() {
+			if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
+				assert.ignore();
+			}
+			this.editorBot.dialog( 'link', function( dialog ) {
+				var container = dialog._.element,
+					element = container.getFirst();
+
+				assert.areEqual( container.getStyle( 'display' ), 'flex', 'Dialog container should have `display:flex`.' );
+				assert.areEqual( element.getStyle( 'position' ), '', 'Dialog element should\'t have position style.' );
+				assert.areEqual( element.getStyle( 'margin' ), 'auto', 'Dialog element should have `margin:auto`.' );
+
+				dialog.hide();
+			} );
+		},
+		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
+		'test dialog move': function() {
+			this.editorBot.dialog( 'link', function( dialog ) {
+				dialog.parts.title.fire( 'mousedown', {
+					$: {
+						screenX: 0,
+						screenY: 0
+					},
+					preventDefault: function() {}
+				} );
+
+				var element = dialog._.element.getFirst(),
+					dialogSize = dialog.getSize(),
+					viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+					expectedX = Math.floor( ( viewPaneSize.width - dialogSize.width ) / 2 ),
+					expectedY = Math.floor( ( viewPaneSize.height - dialogSize.height ) / 2 ),
+					actualX = parseInt( element.getStyle( 'left' ), 10 ),
+					actualY = parseInt( element.getStyle( 'top' ), 10 );
+
+				assert.areEqual( 'absolute', element.getStyle( 'position' ), 'Dialog element should have `position:absolute`.' );
+				assert.areEqual( expectedX, actualX, 'Dialog should be horizontally centered.' );
+				assert.areEqual( expectedY, actualY, 'Dialog should be vertically centered.' );
+
+				CKEDITOR.document.fire( 'mousemove', {
+					$: {
+						screenX: 100,
+						screenY: 100
+					},
+					preventDefault: function() {}
+				} );
+
+				actualX = parseInt( element.getStyle( 'left' ), 10 );
+				actualY = parseInt( element.getStyle( 'top' ), 10 );
+
+				assert.areEqual( 100, actualX - expectedX, 'Dialog should be moved by 100px to the right.' );
+				assert.areEqual( 100, actualY - expectedY, 'Dialog should be moved by 100px down.' );
+
+				CKEDITOR.document.fire( 'mouseup' );
+				dialog.hide();
+			} );
+		}
+	} );
+} )();

From 54b6577143417e99efee78eba7a0ab1805b62281 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 20 Sep 2018 14:15:33 +0200
Subject: [PATCH 08/77] Updated skins to match dialog changes.

---
 skins/kama/dialog.css  | 16 ++++++++++++++++
 skins/moono/dialog.css | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/skins/kama/dialog.css b/skins/kama/dialog.css
index 17f834fd2d5..e0ac2938384 100644
--- a/skins/kama/dialog.css
+++ b/skins/kama/dialog.css
@@ -55,6 +55,7 @@ Comments in this file will give more details about each of the above blocks.
 	padding: 5px;
 	background-color: #fff;
 	border-radius: 5px;
+	position: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */
@@ -896,3 +897,18 @@ a.cke_smile:hover img
 	width:100%;
 	height:100%;
 }
+
+.cke_dialog_open {
+	overflow: hidden;
+}
+
+.cke_dialog_container {
+	position: fixed;
+	overflow-y: auto;
+	overflow-x: auto;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	z-index: 10010;
+}
diff --git a/skins/moono/dialog.css b/skins/moono/dialog.css
index 3d083ae0df7..0ad0de58687 100644
--- a/skins/moono/dialog.css
+++ b/skins/moono/dialog.css
@@ -56,6 +56,7 @@ Comments in this file will give more details about each of the above blocks.
 	border-bottom-color: #999;
 	border-radius: 3px;
 	box-shadow: 0 0 3px rgba(0, 0, 0, .15);
+	position: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */
@@ -1062,3 +1063,18 @@ a.cke_specialchar:active
 	width: 100%;
 	height: 100%;
 }
+
+.cke_dialog_open {
+	overflow: hidden;
+}
+
+.cke_dialog_container {
+	position: fixed;
+	overflow-y: auto;
+	overflow-x: auto;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	z-index: 10010;
+}

From 7911cd9bd0e3d2ff70219734c4f362426dfa8f95 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 20 Sep 2018 14:15:52 +0200
Subject: [PATCH 09/77] Typo

---
 skins/moono-lisa/dialog.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skins/moono-lisa/dialog.css b/skins/moono-lisa/dialog.css
index 657ebba4c6c..0be7dcef148 100644
--- a/skins/moono-lisa/dialog.css
+++ b/skins/moono-lisa/dialog.css
@@ -52,7 +52,7 @@ Comments in this file will give more details about each of the above blocks.
 {
 	z-index: 1;
 	background: #fff;
-	postition: relative;
+	position: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */

From 97bd5a79912669cb810c50ae4a0ae49815f3ed14 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 20 Sep 2018 14:22:34 +0200
Subject: [PATCH 10/77] Tests: added manual test for each skin.

---
 tests/plugins/dialog/manual/skins/kama.html      | 7 +++++++
 tests/plugins/dialog/manual/skins/kama.md        | 5 +++++
 tests/plugins/dialog/manual/skins/moono.html     | 7 +++++++
 tests/plugins/dialog/manual/skins/moono.md       | 5 +++++
 tests/plugins/dialog/manual/skins/moonolisa.html | 5 +++++
 tests/plugins/dialog/manual/skins/moonolisa.md   | 5 +++++
 6 files changed, 34 insertions(+)
 create mode 100644 tests/plugins/dialog/manual/skins/kama.html
 create mode 100644 tests/plugins/dialog/manual/skins/kama.md
 create mode 100644 tests/plugins/dialog/manual/skins/moono.html
 create mode 100644 tests/plugins/dialog/manual/skins/moono.md
 create mode 100644 tests/plugins/dialog/manual/skins/moonolisa.html
 create mode 100644 tests/plugins/dialog/manual/skins/moonolisa.md

diff --git a/tests/plugins/dialog/manual/skins/kama.html b/tests/plugins/dialog/manual/skins/kama.html
new file mode 100644
index 00000000000..eb377a35504
--- /dev/null
+++ b/tests/plugins/dialog/manual/skins/kama.html
@@ -0,0 +1,7 @@
+<textarea id="editor"></textarea>
+
+<script>
+	CKEDITOR.replace( 'editor', {
+		skin: 'kama'
+	} );
+</script>
diff --git a/tests/plugins/dialog/manual/skins/kama.md b/tests/plugins/dialog/manual/skins/kama.md
new file mode 100644
index 00000000000..d3d63bfc467
--- /dev/null
+++ b/tests/plugins/dialog/manual/skins/kama.md
@@ -0,0 +1,5 @@
+@bender-tags: 2395, bug, 4.10.2
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, link
+
+Play around with dialog window to see if it's styling looks correct with no visible glitches.
diff --git a/tests/plugins/dialog/manual/skins/moono.html b/tests/plugins/dialog/manual/skins/moono.html
new file mode 100644
index 00000000000..3dab26144ec
--- /dev/null
+++ b/tests/plugins/dialog/manual/skins/moono.html
@@ -0,0 +1,7 @@
+<textarea id="editor"></textarea>
+
+<script>
+	CKEDITOR.replace( 'editor', {
+		skin: 'moono'
+	} );
+</script>
diff --git a/tests/plugins/dialog/manual/skins/moono.md b/tests/plugins/dialog/manual/skins/moono.md
new file mode 100644
index 00000000000..d3d63bfc467
--- /dev/null
+++ b/tests/plugins/dialog/manual/skins/moono.md
@@ -0,0 +1,5 @@
+@bender-tags: 2395, bug, 4.10.2
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, link
+
+Play around with dialog window to see if it's styling looks correct with no visible glitches.
diff --git a/tests/plugins/dialog/manual/skins/moonolisa.html b/tests/plugins/dialog/manual/skins/moonolisa.html
new file mode 100644
index 00000000000..1db119f7615
--- /dev/null
+++ b/tests/plugins/dialog/manual/skins/moonolisa.html
@@ -0,0 +1,5 @@
+<textarea id="editor"></textarea>
+
+<script>
+	CKEDITOR.replace( 'editor' );
+</script>
diff --git a/tests/plugins/dialog/manual/skins/moonolisa.md b/tests/plugins/dialog/manual/skins/moonolisa.md
new file mode 100644
index 00000000000..d3d63bfc467
--- /dev/null
+++ b/tests/plugins/dialog/manual/skins/moonolisa.md
@@ -0,0 +1,5 @@
+@bender-tags: 2395, bug, 4.10.2
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, link
+
+Play around with dialog window to see if it's styling looks correct with no visible glitches.

From b86067bc2604ba7c48db39a0bbcab82a62fbf0c6 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Mon, 24 Sep 2018 15:26:47 +0200
Subject: [PATCH 11/77] Separated setStyle from return statement.

---
 plugins/dialog/plugin.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index c2d94aa9f13..3f1936afb0a 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -950,8 +950,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			if ( !this._.moved && ( !CKEDITOR.env.ie || CKEDITOR.env.edge ) ) {
 				el.removeStyle( 'position' );
 				el.setStyle( 'margin', 'auto' );
+				el.getParent().setStyle( 'display', 'flex' );
 
-				return el.getParent().setStyle( 'display', 'flex' );
+				return;
 			}
 
 			var dialogSize = this.getSize(),

From 3bef599ae800cbb59b9fbd3c3ceabaef4c8297aa Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 25 Sep 2018 12:10:38 +0200
Subject: [PATCH 12/77] Removed adding right padding for covering removed
 scrollbars.

---
 plugins/dialog/plugin.js | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 3f1936afb0a..000caadf718 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2130,33 +2130,11 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	}
 
 	function hideBodyScrollbars() {
-		var document = CKEDITOR.document,
-			body = document.getBody(),
-			scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth,
-			paddingRight = body.getComputedStyle( 'padding-right' );
-
-		if ( paddingRight ) {
-			paddingRight = CKEDITOR.tools.convertToPx( paddingRight );
-		}
-
-		body.addClass( 'cke_dialog_open' );
-
-		if ( !paddingRight && scrollBarWidth ) {
-			// Add right padding, to prevent from resizing elements, when scrollbars are gone.
-			// Don't do anything, when there is any padding on body element, to not break things.
-			body.setStyle( 'padding-right', scrollBarWidth + 'px' );
-			body.addClass( 'cke_body_extra_padding' );
-		}
+		CKEDITOR.document.getBody().addClass( 'cke_dialog_open' );
 	}
 
 	function showBodyScrollbars() {
-		var body = CKEDITOR.document.getBody();
-		body.removeClass( 'cke_dialog_open' );
-
-		if ( body.hasClass( 'cke_body_extra_padding' ) ) {
-			body.removeStyle( 'padding-right' );
-			body.removeClass( 'cke_body_extra_padding' );
-		}
+		CKEDITOR.document.getBody().removeClass( 'cke_dialog_open' );
 	}
 
 	function showCover( editor ) {

From c2f362f85dc580ed47d6dd42723f9cdb01978d9a Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 25 Sep 2018 12:14:16 +0200
Subject: [PATCH 13/77] Removed resizeCover method, it is now rezised with css.

---
 plugins/dialog/plugin.js | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 000caadf718..afad5b19ee3 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2119,7 +2119,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 	}
 
-	var resizeCover;
 	// Caching resuable covers and allowing only one cover
 	// on screen.
 	var covers = {},
@@ -2154,6 +2153,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				'<div tabIndex="-1" style="position: ', ( CKEDITOR.env.ie6Compat ? 'absolute' : 'fixed' ),
 				'; z-index: ', baseFloatZIndex,
 				'; top: 0px; left: 0px; ',
+				'; width: 100%; height: 100%;',
 				( !CKEDITOR.env.ie6Compat ? 'background-color: ' + backgroundColorStyle : '' ),
 				'" class="cke_dialog_background_cover">'
 			];
@@ -2206,13 +2206,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		editor.focusManager.add( coverElement );
 
 		currentCover = coverElement;
-		var resizeFunc = function() {
-				var size = win.getViewPaneSize();
-				coverElement.setStyles( {
-					width: size.width + 'px',
-					height: size.height + 'px'
-				} );
-			};
 
 		var scrollFunc = function() {
 				var pos = win.getScrollPosition(),
@@ -2230,9 +2223,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				}
 			};
 
-		resizeCover = resizeFunc;
-		win.on( 'resize', resizeFunc );
-		resizeFunc();
 		// Using Safari/Mac, focus must be kept where it is (https://dev.ckeditor.com/ticket/7027)
 		if ( !( CKEDITOR.env.mac && CKEDITOR.env.webkit ) )
 			coverElement.focus();
@@ -2262,17 +2252,12 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		var win = CKEDITOR.document.getWindow();
 		currentCover.hide();
 
-		// Remove the current cover reference once the cover is removed (#589).
-		currentCover = null;
-		win.removeListener( 'resize', resizeCover );
-
 		if ( CKEDITOR.env.ie6Compat ) {
 			win.$.setTimeout( function() {
 				var prevScrollHandler = window.onscroll && window.onscroll.prevScrollHandler;
 				window.onscroll = prevScrollHandler || null;
 			}, 0 );
 		}
-		resizeCover = null;
 	}
 
 	function removeCovers() {

From ef2ef74509f9614abcf5ad27207cf505c6a4b70f Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 25 Sep 2018 12:18:08 +0200
Subject: [PATCH 14/77] Typo.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index afad5b19ee3..4501c48728e 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2119,7 +2119,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 	}
 
-	// Caching resuable covers and allowing only one cover
+	// Caching reusable covers and allowing only one cover
 	// on screen.
 	var covers = {},
 		currentCover;

From 4f8e300cf9be4badf99ed11179c948a8efcaaf57 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 25 Sep 2018 14:23:16 +0200
Subject: [PATCH 15/77] Moved initial styles to template.

---
 plugins/dialog/plugin.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 4501c48728e..5e2a1b884f6 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -137,12 +137,14 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 	var templateSource = '<div class="cke_reset_all cke_dialog_container {editorId} {editorDialogClass} {hidpi}' +
 		'" dir="{langDir}"' +
+		' style="' + ( !CKEDITOR.env.ie || CKEDITOR.env.edge ? 'display:flex' : '' ) + '"' +
 		' lang="{langCode}"' +
 		' role="dialog"' +
 		' aria-labelledby="cke_dialog_title_{id}"' +
 		'>' +
 		'<table class="cke_dialog ' + CKEDITOR.env.cssClass + ' cke_{langDir}"' +
-			' style="position:absolute" role="presentation">' +
+			' style="' + ( !CKEDITOR.env.ie || CKEDITOR.env.edge ? 'margin:auto' : 'position:absolute' ) + '"' +
+			' role="presentation">' +
 			'<tr><td role="presentation">' +
 			'<div class="cke_dialog_body" role="presentation">' +
 				'<div id="cke_dialog_title_{id}" class="cke_dialog_title" role="presentation"></div>' +
@@ -838,10 +840,13 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			// Insert the dialog's element to the root document.
 			var element = this._.element;
 			var definition = this.definition;
-			if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) )
+
+			if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) {
 				element.appendTo( CKEDITOR.document.getBody() );
-			else
-				element.setStyle( 'display', 'block' );
+			} else {
+				var display = ( !CKEDITOR.env.ie && CKEDITOR.env.edge ) ? 'block' : 'flex';
+				element.setStyle( 'display', display );
+			}
 
 			// First, set the dialog to an appropriate size.
 			this.resize(
@@ -948,10 +953,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			var el = this.parts.dialog;
 
 			if ( !this._.moved && ( !CKEDITOR.env.ie || CKEDITOR.env.edge ) ) {
-				el.removeStyle( 'position' );
-				el.setStyle( 'margin', 'auto' );
-				el.getParent().setStyle( 'display', 'flex' );
-
 				return;
 			}
 

From da4018ae899a0a76311c4080162da65aff5bc74b Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 26 Sep 2018 11:06:16 +0200
Subject: [PATCH 16/77] Removed redundant position style.

---
 plugins/dialog/plugin.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 5e2a1b884f6..10e031f26ad 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -283,11 +283,14 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		// Set the startup styles for the dialog, avoiding it enlarging the
 		// page size on the dialog creation.
 		var startStyles = {
-			position: CKEDITOR.env.ie6Compat ? 'absolute' : 'static',
 			top: 0,
 			visibility: 'hidden'
 		};
 
+		if ( CKEDITOR.env.ie6Compat ) {
+			startStyles.position = 'absolute';
+		}
+
 		startStyles[ dir == 'rtl' ? 'right' : 'left' ] = 0;
 		this.parts.dialog.setStyles( startStyles );
 

From 02fee18827872a9238cf6243019029b27a45ab3d Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 26 Sep 2018 11:06:38 +0200
Subject: [PATCH 17/77] Tests: updated after changes.

---
 tests/plugins/dialog/positioning.js | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 5f261f95042..ed446072679 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -16,31 +16,16 @@
 			}
 			var bot = this.editorBot,
 				document = CKEDITOR.document,
-				body = document.getBody(),
-				scrollBarWidth;
+				body = document.getBody();
 
 			body.appendHtml( '<div style="height:4000px"></div>' );
-			scrollBarWidth = document.getWindow().$.innerWidth - document.$.documentElement.clientWidth;
 
 			bot.dialog( 'link', function( dialog ) {
 				assert.isTrue( body.hasClass( 'cke_dialog_open' ), 'Body should have proper class.' );
-				assert.isTrue( body.hasClass( 'cke_body_extra_padding' ), 'Body should have proper class.' );
-				assert.areSame( scrollBarWidth + 'px', body.getStyle( 'padding-right' ), 'Body should have right padding.' );
 
 				dialog.hide();
 
 				assert.isFalse( body.hasClass( 'cke_dialog_open' ), 'Body shouldn\'t have class.' );
-				assert.areSame( '', body.getStyle( 'padding-right' ), 'Body shouldn\'t have right padding.' );
-
-				body.setStyle( 'padding-right', '1em' );
-
-				bot.dialog( 'link', function( dialog ) {
-					assert.areSame( '1em', body.getStyle( 'padding-right' ), 'Right padding should be preserved on body.' );
-					assert.isFalse( body.hasClass( 'cke_body_extra_padding' ), 'Body shouldn\'t have class.' );
-					dialog.hide();
-
-					assert.areSame( '1em', body.getStyle( 'padding-right' ), 'Right padding should be preserved on body.' );
-				} );
 			} );
 		},
 		// Dialog is initially centered by CSS styles:
@@ -61,6 +46,16 @@
 				dialog.hide();
 			} );
 		},
+		'test dialog cover styles': function() {
+			this.editorBot.dialog( 'link', function( dialog ) {
+				var cover = CKEDITOR.document.findOne( '.cke_dialog_background_cover' );
+
+				assert.areEqual( cover.getStyle( 'width' ), '100%', 'Dialog element should have `width:100%`.' );
+				assert.areEqual( cover.getStyle( 'height' ), '100%', 'Dialog element should have `height:100%`.' );
+
+				dialog.hide();
+			} );
+		},
 		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
 		'test dialog move': function() {
 			this.editorBot.dialog( 'link', function( dialog ) {

From bfba472977357751279b0aa0903486503e96b017 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 26 Sep 2018 11:35:35 +0200
Subject: [PATCH 18/77] Tests: fixed failing on very small window.

---
 tests/plugins/dialog/positioning.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index ed446072679..ddb55473ba5 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -59,6 +59,23 @@
 		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
 		'test dialog move': function() {
 			this.editorBot.dialog( 'link', function( dialog ) {
+				var window = CKEDITOR.document.getWindow(),
+					viewPaneSize = {
+						width: 1000,
+						height: 1000
+					},
+					element = dialog._.element.getFirst(),
+					dialogSize = dialog.getSize(),
+					expectedX = Math.floor( ( viewPaneSize.width - dialogSize.width ) / 2 ),
+					expectedY = Math.floor( ( viewPaneSize.height - dialogSize.height ) / 2 ),
+					stubs = {
+						getWindow: sinon.stub( CKEDITOR.document, 'getWindow' ),
+						getViewPane: sinon.stub( window, 'getViewPaneSize' )
+					};
+
+				stubs.getWindow.returns( window );
+				stubs.getViewPane.returns( viewPaneSize );
+
 				dialog.parts.title.fire( 'mousedown', {
 					$: {
 						screenX: 0,
@@ -67,12 +84,7 @@
 					preventDefault: function() {}
 				} );
 
-				var element = dialog._.element.getFirst(),
-					dialogSize = dialog.getSize(),
-					viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
-					expectedX = Math.floor( ( viewPaneSize.width - dialogSize.width ) / 2 ),
-					expectedY = Math.floor( ( viewPaneSize.height - dialogSize.height ) / 2 ),
-					actualX = parseInt( element.getStyle( 'left' ), 10 ),
+				var actualX = parseInt( element.getStyle( 'left' ), 10 ),
 					actualY = parseInt( element.getStyle( 'top' ), 10 );
 
 				assert.areEqual( 'absolute', element.getStyle( 'position' ), 'Dialog element should have `position:absolute`.' );
@@ -95,6 +107,10 @@
 
 				CKEDITOR.document.fire( 'mouseup' );
 				dialog.hide();
+
+				for ( var key in stubs ) {
+					stubs[ key ].restore();
+				}
 			} );
 		}
 	} );

From 1cfbc2fbb96d6baecc94396425cb041839182274 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 26 Sep 2018 11:44:12 +0200
Subject: [PATCH 19/77] Removed code which is redundant after changes.

---
 plugins/dialog/plugin.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 10e031f26ad..ae61d53e81f 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -972,17 +972,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				posY = ( viewSize.height - dialogSize.height ) / 2;
 			}
 
-			// Switch to absolute position when viewport is smaller than dialog size.
 			if ( !CKEDITOR.env.ie6Compat ) {
-				if ( dialogSize.height + ( posY > 0 ? posY : 0 ) > viewSize.height || dialogSize.width + ( posX > 0 ? posX : 0 ) > viewSize.width ) {
-					el.setStyles( {
-						position: 'static',
-						margin: 'auto'
-					} );
-				} else {
-					el.setStyle( 'position', 'absolute' );
-					el.removeStyle( 'margin' );
-				}
+				el.setStyle( 'position', 'absolute' );
+				el.removeStyle( 'margin' );
 			}
 
 			this.move( posX, posY );

From 0f2d2a4d346fc8424cc35f8decb95918ce651563 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 26 Sep 2018 11:56:01 +0200
Subject: [PATCH 20/77] Removed oneliner functions.

---
 plugins/dialog/plugin.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index ae61d53e81f..7fae12b7dab 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2124,14 +2124,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		ev.data.preventDefault( 1 );
 	}
 
-	function hideBodyScrollbars() {
-		CKEDITOR.document.getBody().addClass( 'cke_dialog_open' );
-	}
-
-	function showBodyScrollbars() {
-		CKEDITOR.document.getBody().removeClass( 'cke_dialog_open' );
-	}
-
 	function showCover( editor ) {
 		var win = CKEDITOR.document.getWindow(),
 			config = editor.config,
@@ -2142,7 +2134,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			coverKey = CKEDITOR.tools.genKey( backgroundColorStyle, backgroundCoverOpacity, baseFloatZIndex ),
 			coverElement = covers[ coverKey ];
 
-		hideBodyScrollbars();
+		CKEDITOR.document.getBody().addClass( 'cke_dialog_open' );
 
 		if ( !coverElement ) {
 			var html = [
@@ -2240,7 +2232,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	}
 
 	function hideCover( editor ) {
-		showBodyScrollbars();
+		CKEDITOR.document.getBody().removeClass( 'cke_dialog_open' );
 		if ( !currentCover )
 			return;
 

From a78ee710c574370a3b3e09fb846db5faf9046cb3 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 3 Oct 2018 14:54:09 +0200
Subject: [PATCH 21/77] Transformed pixel coordinates into percentage.

---
 plugins/dialog/plugin.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 7fae12b7dab..c449280705a 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -807,14 +807,20 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			// Save the current position.
 			this._.position = { x: x, y: y };
 
+			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize();
+
 			// Translate coordinate for RTL.
 			if ( rtl ) {
-				var dialogSize = this.getSize(), viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize();
+				var dialogSize = this.getSize();
 				x = viewPaneSize.width - dialogSize.width - x;
 			}
 
-			var styles = { 'top': ( y > 0 ? y : 0 ) + 'px' };
-			styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + 'px';
+			// Recalculate pixes into percentages.
+			x = x / viewPaneSize.width * 100;
+			y = y / viewPaneSize.height * 100;
+
+			var styles = { 'top': ( y > 0 ? y : 0 ) + '%' };
+			styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + '%';
 
 			element.setStyles( styles );
 

From 474702a6fca490367334b2b6b70f82feec0d4ddc Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 3 Oct 2018 15:49:46 +0200
Subject: [PATCH 22/77] Tests: fixed failing on IE.

---
 tests/plugins/dialog/positioning.js | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index ddb55473ba5..db6bab6b23d 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -58,20 +58,24 @@
 		},
 		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
 		'test dialog move': function() {
+			var window = CKEDITOR.document.getWindow(),
+				viewPaneSize = {
+					width: 1000,
+					height: 1000
+				},
+				stubs = {
+					getWindow: sinon.stub( CKEDITOR.document, 'getWindow' ),
+					getViewPane: sinon.stub( window, 'getViewPaneSize' )
+				};
+
+			stubs.getWindow.returns( window );
+			stubs.getViewPane.returns( viewPaneSize );
+
 			this.editorBot.dialog( 'link', function( dialog ) {
-				var window = CKEDITOR.document.getWindow(),
-					viewPaneSize = {
-						width: 1000,
-						height: 1000
-					},
-					element = dialog._.element.getFirst(),
+				var element = dialog._.element.getFirst(),
 					dialogSize = dialog.getSize(),
 					expectedX = Math.floor( ( viewPaneSize.width - dialogSize.width ) / 2 ),
-					expectedY = Math.floor( ( viewPaneSize.height - dialogSize.height ) / 2 ),
-					stubs = {
-						getWindow: sinon.stub( CKEDITOR.document, 'getWindow' ),
-						getViewPane: sinon.stub( window, 'getViewPaneSize' )
-					};
+					expectedY = Math.floor( ( viewPaneSize.height - dialogSize.height ) / 2 );
 
 				stubs.getWindow.returns( window );
 				stubs.getViewPane.returns( viewPaneSize );

From e774a57584a0cc3d0b3f056d54c6394f0011d35a Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 3 Oct 2018 16:00:12 +0200
Subject: [PATCH 23/77] Removed var declaration and moved it inline into fn
 call.

---
 plugins/dialog/plugin.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index c449280705a..a1084e1b4b6 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -853,8 +853,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) {
 				element.appendTo( CKEDITOR.document.getBody() );
 			} else {
-				var display = ( !CKEDITOR.env.ie && CKEDITOR.env.edge ) ? 'block' : 'flex';
-				element.setStyle( 'display', display );
+				element.setStyle( 'display', CKEDITOR.env.ie && !CKEDITOR.env.edge ? 'block' : 'flex' );
 			}
 
 			// First, set the dialog to an appropriate size.

From 330df4c96d03905ce9f67c99372aab9bb77064d5 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Mon, 8 Oct 2018 13:38:07 +0200
Subject: [PATCH 24/77] Restored window resize listener. Dialog position will
 be updated when resizing.

---
 plugins/dialog/plugin.js | 82 +++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index a1084e1b4b6..ec6e6c6db80 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -786,46 +786,54 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		 * @param {Number} y The target y-coordinate.
 		 * @param {Boolean} save Flag indicate whether the dialog position should be remembered on next open up.
 		 */
-		move: function( x, y, save ) {
-
-			var element = this._.element.getFirst(), rtl = this._.editor.lang.dir == 'rtl';
-
-			// (https://dev.ckeditor.com/ticket/8888) In some cases of a very small viewport, dialog is incorrectly
-			// positioned in IE7. It also happens that it remains sticky and user cannot
-			// scroll down/up to reveal dialog's content below/above the viewport; this is
-			// cumbersome.
-			// The only way to fix this is to move mouse out of the browser and
-			// go back to see that dialog position is automagically fixed. No events,
-			// no style change - pure magic. This is a IE7 rendering issue, which can be
-			// fixed with dummy style redraw on each move.
-			if ( CKEDITOR.env.ie )
-				element.setStyle( 'zoom', '100%' );
-
-			if ( this._.position && this._.position.x == x && this._.position.y == y )
-				return;
-
-			// Save the current position.
-			this._.position = { x: x, y: y };
-
-			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize();
+		move: ( function() {
+			var fractionOfFreeSpace = {};
+
+			return function( x, y, save ) {
+				var element = this._.element.getFirst(), rtl = this._.editor.lang.dir == 'rtl';
+
+				// (https://dev.ckeditor.com/ticket/8888) In some cases of a very small viewport, dialog is incorrectly
+				// positioned in IE7. It also happens that it remains sticky and user cannot
+				// scroll down/up to reveal dialog's content below/above the viewport; this is
+				// cumbersome.
+				// The only way to fix this is to move mouse out of the browser and
+				// go back to see that dialog position is automagically fixed. No events,
+				// no style change - pure magic. This is a IE7 rendering issue, which can be
+				// fixed with dummy style redraw on each move.
+				if ( CKEDITOR.env.ie ) {
+					element.setStyle( 'zoom', '100%' );
+				}
 
-			// Translate coordinate for RTL.
-			if ( rtl ) {
-				var dialogSize = this.getSize();
-				x = viewPaneSize.width - dialogSize.width - x;
-			}
+				var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+					dialogSize = this.getSize(),
+					freeSpace = {
+						width: viewPaneSize.width - dialogSize.width,
+						height: viewPaneSize.height - dialogSize.height
+					};
+				if ( this._.position && this._.position.x == x && this._.position.y == y ) {
+					// If position didn't change window might have been resized.
+					x = freeSpace.width * fractionOfFreeSpace.width;
+					y = freeSpace.height * fractionOfFreeSpace.height;
+				} else {
+					fractionOfFreeSpace.width = x / freeSpace.width;
+					fractionOfFreeSpace.height = y / freeSpace.height;
+				}
+				// Save the current position.
+				this._.position = { x: x, y: y };
 
-			// Recalculate pixes into percentages.
-			x = x / viewPaneSize.width * 100;
-			y = y / viewPaneSize.height * 100;
+				// Translate coordinate for RTL.
+				if ( rtl ) {
+					x = freeSpace.width - x;
+				}
 
-			var styles = { 'top': ( y > 0 ? y : 0 ) + '%' };
-			styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + '%';
+				var styles = { 'top': ( y > 0 ? y : 0 ) + 'px' };
+				styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + 'px';
 
-			element.setStyles( styles );
+				element.setStyles( styles );
 
-			save && ( this._.moved = 1 );
-		},
+				save && ( this._.moved = 1 );
+			};
+		} )(),
 
 		/**
 		 * Gets the dialog's position in the window.
@@ -928,9 +936,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			CKEDITOR.tools.setTimeout( function() {
 				this.layout();
-				if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
-					resizeWithWindow( this );
-				}
+				resizeWithWindow( this );
 
 				this.parts.dialog.setStyle( 'visibility', '' );
 

From e19e5bc606bd17e8fe866a2a9defa9032251f6a5 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 12 Oct 2018 14:09:52 +0200
Subject: [PATCH 25/77] Tests: bumped tag version.

---
 tests/plugins/dialog/manual/inputfocus.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index 5b47992e264..711a23ce6b9 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.10.2
+@bender-tags: 2395, bug, 4.11.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 1e8424834ed5b12437b9213387c101719899b96e Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 12 Oct 2018 14:26:02 +0200
Subject: [PATCH 26/77] Tests: refactored and removed comments.

---
 tests/plugins/dialog/positioning.js | 42 ++++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index db6bab6b23d..e459b2101dd 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -7,18 +7,22 @@
 	bender.editor = {};
 
 	bender.test( {
-		// When dialog is shown body has overflow hidden from class 'cke_dialog_open'
-		// and right padding equal to the scrollbars width. When there is predefined right padding
-		// it should be preserved. All extra styling is removed on dialog hide (#2395).
+		setUp: function() {
+			CKEDITOR.document.document.getBody().appendHtml( '<div style="height:4000px"></div>' );
+		},
+		tearDown: function() {
+			var dialog = CKEDITOR.dialog.getCurrent();
+			if ( dialog ) {
+				dialog.hide();
+			}
+		},
+		// (#2395).
 		'test body has hidden scrollbars when dialog is opened': function() {
 			if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
 				assert.ignore();
 			}
 			var bot = this.editorBot,
-				document = CKEDITOR.document,
-				body = document.getBody();
-
-			body.appendHtml( '<div style="height:4000px"></div>' );
+				body = CKEDITOR.document.getBody();
 
 			bot.dialog( 'link', function( dialog ) {
 				assert.isTrue( body.hasClass( 'cke_dialog_open' ), 'Body should have proper class.' );
@@ -28,9 +32,7 @@
 				assert.isFalse( body.hasClass( 'cke_dialog_open' ), 'Body shouldn\'t have class.' );
 			} );
 		},
-		// Dialog is initially centered by CSS styles:
-		// When dialog is shown page is covered by fixed dialog container with `display: flex`.
-		// Dialog element doesn't have `position` style, and has `margin: auto` (#2395).
+		// (#2395).
 		'test dialog is initially centered': function() {
 			if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
 				assert.ignore();
@@ -46,6 +48,7 @@
 				dialog.hide();
 			} );
 		},
+		// (#2395).
 		'test dialog cover styles': function() {
 			this.editorBot.dialog( 'link', function( dialog ) {
 				var cover = CKEDITOR.document.findOne( '.cke_dialog_background_cover' );
@@ -89,11 +92,8 @@
 				} );
 
 				var actualX = parseInt( element.getStyle( 'left' ), 10 ),
-					actualY = parseInt( element.getStyle( 'top' ), 10 );
-
-				assert.areEqual( 'absolute', element.getStyle( 'position' ), 'Dialog element should have `position:absolute`.' );
-				assert.areEqual( expectedX, actualX, 'Dialog should be horizontally centered.' );
-				assert.areEqual( expectedY, actualY, 'Dialog should be vertically centered.' );
+					actualY = parseInt( element.getStyle( 'top' ), 10 ),
+					elementStyle = element.getStyle( 'position' );
 
 				CKEDITOR.document.fire( 'mousemove', {
 					$: {
@@ -103,6 +103,14 @@
 					preventDefault: function() {}
 				} );
 
+				for ( var key in stubs ) {
+					stubs[ key ].restore();
+				}
+
+				assert.areEqual( 'absolute', elementStyle, 'Dialog element should have `position:absolute`.' );
+				assert.areEqual( expectedX, actualX, 'Dialog should be horizontally centered.' );
+				assert.areEqual( expectedY, actualY, 'Dialog should be vertically centered.' );
+
 				actualX = parseInt( element.getStyle( 'left' ), 10 );
 				actualY = parseInt( element.getStyle( 'top' ), 10 );
 
@@ -111,10 +119,6 @@
 
 				CKEDITOR.document.fire( 'mouseup' );
 				dialog.hide();
-
-				for ( var key in stubs ) {
-					stubs[ key ].restore();
-				}
 			} );
 		}
 	} );

From 47068ef6f6edbfc227c76f243cb6b7720b94d088 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 12 Oct 2018 14:33:34 +0200
Subject: [PATCH 27/77] Tests: added comments.

---
 tests/plugins/dialog/positioning.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index e459b2101dd..7282b04ddcb 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -8,6 +8,7 @@
 
 	bender.test( {
 		setUp: function() {
+			// Make sure page is scrollable on vertical screens.
 			CKEDITOR.document.document.getBody().appendHtml( '<div style="height:4000px"></div>' );
 		},
 		tearDown: function() {
@@ -60,6 +61,33 @@
 			} );
 		},
 		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
+		//
+		// A - mouse cursor
+		//
+		// Drag start:
+		// +----------------------------------+
+		// |      Editor viewport             |
+		// |                                  |
+		// |        +-------------A--+        |
+		// |        |                |        |
+		// |        |   Dialog       |        |
+		// |        |                |        |
+		// |        +----------------+        |
+		// |                                  |
+		// +----------------------------------+
+		//
+		// Drag end:
+		// +----------------------------------+
+		// |      Editor viewport             |
+		// |                                  |
+		// |                                  |
+		// |                +-------------A--+|
+		// |                |                ||
+		// |                |   Dialog       ||
+		// |                |                ||
+		// |                +----------------+|
+		// +----------------------------------+
+		//
 		'test dialog move': function() {
 			var window = CKEDITOR.document.getWindow(),
 				viewPaneSize = {

From c31924dba864e50afae286d7e2dd491c41aa085a Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 12 Oct 2018 14:49:29 +0200
Subject: [PATCH 28/77] Renamed variable.

---
 plugins/dialog/plugin.js            | 84 ++++++++++++++---------------
 tests/plugins/dialog/positioning.js |  2 +-
 2 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index ec6e6c6db80..58ac92a1b48 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -717,6 +717,8 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		} );
 	}
 
+	var dialogViewportRatio = {};
+
 	CKEDITOR.dialog.prototype = {
 		destroy: function() {
 			this.hide();
@@ -786,54 +788,50 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		 * @param {Number} y The target y-coordinate.
 		 * @param {Boolean} save Flag indicate whether the dialog position should be remembered on next open up.
 		 */
-		move: ( function() {
-			var fractionOfFreeSpace = {};
-
-			return function( x, y, save ) {
-				var element = this._.element.getFirst(), rtl = this._.editor.lang.dir == 'rtl';
-
-				// (https://dev.ckeditor.com/ticket/8888) In some cases of a very small viewport, dialog is incorrectly
-				// positioned in IE7. It also happens that it remains sticky and user cannot
-				// scroll down/up to reveal dialog's content below/above the viewport; this is
-				// cumbersome.
-				// The only way to fix this is to move mouse out of the browser and
-				// go back to see that dialog position is automagically fixed. No events,
-				// no style change - pure magic. This is a IE7 rendering issue, which can be
-				// fixed with dummy style redraw on each move.
-				if ( CKEDITOR.env.ie ) {
-					element.setStyle( 'zoom', '100%' );
-				}
+		move: function( x, y, save ) {
+			var element = this._.element.getFirst(), rtl = this._.editor.lang.dir == 'rtl';
+
+			// (https://dev.ckeditor.com/ticket/8888) In some cases of a very small viewport, dialog is incorrectly
+			// positioned in IE7. It also happens that it remains sticky and user cannot
+			// scroll down/up to reveal dialog's content below/above the viewport; this is
+			// cumbersome.
+			// The only way to fix this is to move mouse out of the browser and
+			// go back to see that dialog position is automagically fixed. No events,
+			// no style change - pure magic. This is a IE7 rendering issue, which can be
+			// fixed with dummy style redraw on each move.
+			if ( CKEDITOR.env.ie ) {
+				element.setStyle( 'zoom', '100%' );
+			}
 
-				var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
-					dialogSize = this.getSize(),
-					freeSpace = {
-						width: viewPaneSize.width - dialogSize.width,
-						height: viewPaneSize.height - dialogSize.height
-					};
-				if ( this._.position && this._.position.x == x && this._.position.y == y ) {
-					// If position didn't change window might have been resized.
-					x = freeSpace.width * fractionOfFreeSpace.width;
-					y = freeSpace.height * fractionOfFreeSpace.height;
-				} else {
-					fractionOfFreeSpace.width = x / freeSpace.width;
-					fractionOfFreeSpace.height = y / freeSpace.height;
-				}
-				// Save the current position.
-				this._.position = { x: x, y: y };
+			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+				dialogSize = this.getSize(),
+				freeSpace = {
+					width: viewPaneSize.width - dialogSize.width,
+					height: viewPaneSize.height - dialogSize.height
+				};
+			if ( this._.position && this._.position.x == x && this._.position.y == y ) {
+				// If position didn't change window might have been resized.
+				x = freeSpace.width * dialogViewportRatio.width;
+				y = freeSpace.height * dialogViewportRatio.height;
+			} else {
+				dialogViewportRatio.width = x / freeSpace.width;
+				dialogViewportRatio.height = y / freeSpace.height;
+			}
+			// Save the current position.
+			this._.position = { x: x, y: y };
 
-				// Translate coordinate for RTL.
-				if ( rtl ) {
-					x = freeSpace.width - x;
-				}
+			// Translate coordinate for RTL.
+			if ( rtl ) {
+				x = freeSpace.width - x;
+			}
 
-				var styles = { 'top': ( y > 0 ? y : 0 ) + 'px' };
-				styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + 'px';
+			var styles = { 'top': ( y > 0 ? y : 0 ) + 'px' };
+			styles[ rtl ? 'right' : 'left' ] = ( x > 0 ? x : 0 ) + 'px';
 
-				element.setStyles( styles );
+			element.setStyles( styles );
 
-				save && ( this._.moved = 1 );
-			};
-		} )(),
+			save && ( this._.moved = 1 );
+		},
 
 		/**
 		 * Gets the dialog's position in the window.
diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 7282b04ddcb..9c168731eff 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -9,7 +9,7 @@
 	bender.test( {
 		setUp: function() {
 			// Make sure page is scrollable on vertical screens.
-			CKEDITOR.document.document.getBody().appendHtml( '<div style="height:4000px"></div>' );
+			CKEDITOR.document.getBody().appendHtml( '<div style="height:4000px"></div>' );
 		},
 		tearDown: function() {
 			var dialog = CKEDITOR.dialog.getCurrent();

From dbc4a62208c125a6801dd3917010a9dce7e8a42a Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 12 Oct 2018 16:28:51 +0200
Subject: [PATCH 29/77] Tests: added test case.

---
 tests/plugins/dialog/positioning.js | 35 ++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 9c168731eff..f06d2bcdbf2 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -108,9 +108,6 @@
 					expectedX = Math.floor( ( viewPaneSize.width - dialogSize.width ) / 2 ),
 					expectedY = Math.floor( ( viewPaneSize.height - dialogSize.height ) / 2 );
 
-				stubs.getWindow.returns( window );
-				stubs.getViewPane.returns( viewPaneSize );
-
 				dialog.parts.title.fire( 'mousedown', {
 					$: {
 						screenX: 0,
@@ -148,6 +145,38 @@
 				CKEDITOR.document.fire( 'mouseup' );
 				dialog.hide();
 			} );
+		},
+
+		'test dialog resize': function() {
+			this.editorBot.dialog( 'link', function( dialog ) {
+				var dialogSize = dialog.getSize(),
+					resizer = dialog._.element.findOne( '.cke_resizer' ),
+					sizeChange;
+
+				resizer.$.onmousedown( {
+					screenX: 0,
+					screenY: 0
+				} );
+
+				CKEDITOR.document.fire( 'mousemove', {
+					$: {
+						screenX: 10,
+						screenY: 10
+					},
+					preventDefault: function() {}
+				} );
+
+				CKEDITOR.document.fire( 'mouseup' );
+
+				sizeChange = {
+					width: dialog.getSize().width - dialogSize.width,
+					height: dialog.getSize().height - dialogSize.height
+				};
+
+				// When resizing some floats might be rounded.
+				assert.isNumberInRange( 10, sizeChange.width - 1, sizeChange.width );
+				assert.isNumberInRange( 10, sizeChange.height - 1, sizeChange.height );
+			} );
 		}
 	} );
 } )();

From d16937666e418572605afd47c78857c5a7e2e57c Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 12 Oct 2018 16:47:10 +0200
Subject: [PATCH 30/77] Tests: removed dialog.hide call in tests as it has been
 moved to tearDown.

---
 tests/plugins/dialog/positioning.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index f06d2bcdbf2..e438ff2a849 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -45,19 +45,15 @@
 				assert.areEqual( container.getStyle( 'display' ), 'flex', 'Dialog container should have `display:flex`.' );
 				assert.areEqual( element.getStyle( 'position' ), '', 'Dialog element should\'t have position style.' );
 				assert.areEqual( element.getStyle( 'margin' ), 'auto', 'Dialog element should have `margin:auto`.' );
-
-				dialog.hide();
 			} );
 		},
 		// (#2395).
 		'test dialog cover styles': function() {
-			this.editorBot.dialog( 'link', function( dialog ) {
+			this.editorBot.dialog( 'link', function() {
 				var cover = CKEDITOR.document.findOne( '.cke_dialog_background_cover' );
 
 				assert.areEqual( cover.getStyle( 'width' ), '100%', 'Dialog element should have `width:100%`.' );
 				assert.areEqual( cover.getStyle( 'height' ), '100%', 'Dialog element should have `height:100%`.' );
-
-				dialog.hide();
 			} );
 		},
 		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
@@ -143,7 +139,6 @@
 				assert.areEqual( 100, actualY - expectedY, 'Dialog should be moved by 100px down.' );
 
 				CKEDITOR.document.fire( 'mouseup' );
-				dialog.hide();
 			} );
 		},
 

From 8bfed0ca9cf7c106c2e3850ed16a048914702847 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Mon, 15 Oct 2018 09:08:41 +0200
Subject: [PATCH 31/77] Free space which is uses for dialog positioning
 calculations can't be negative anymore.

---
 plugins/dialog/plugin.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 58ac92a1b48..c3db3229241 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -806,8 +806,8 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
 				dialogSize = this.getSize(),
 				freeSpace = {
-					width: viewPaneSize.width - dialogSize.width,
-					height: viewPaneSize.height - dialogSize.height
+					width: Math.max( viewPaneSize.width - dialogSize.width, 0 ),
+					height: Math.max( viewPaneSize.height - dialogSize.height, 0 )
 				};
 			if ( this._.position && this._.position.x == x && this._.position.y == y ) {
 				// If position didn't change window might have been resized.

From 78eb0881ca04c5184f2abbefe5d598547b96f60e Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 12:01:35 +0100
Subject: [PATCH 32/77] Moved variable dialogViewportRatio from plugin scope to
 instance private property. So each dialog has separate position.

---
 plugins/dialog/plugin.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index c3db3229241..8731ee04807 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -258,6 +258,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			contents: {},
 			buttons: {},
 			accessKeyMap: {},
+			viewportRatio: {},
 
 			// Initialize the tab and page map.
 			tabs: {},
@@ -717,8 +718,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		} );
 	}
 
-	var dialogViewportRatio = {};
-
 	CKEDITOR.dialog.prototype = {
 		destroy: function() {
 			this.hide();
@@ -811,11 +810,11 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				};
 			if ( this._.position && this._.position.x == x && this._.position.y == y ) {
 				// If position didn't change window might have been resized.
-				x = freeSpace.width * dialogViewportRatio.width;
-				y = freeSpace.height * dialogViewportRatio.height;
+				x = freeSpace.width * this._.viewportRatio.width;
+				y = freeSpace.height * this._.viewportRatio.height;
 			} else {
-				dialogViewportRatio.width = x / freeSpace.width;
-				dialogViewportRatio.height = y / freeSpace.height;
+				this._.viewportRatio.width = x / freeSpace.width;
+				this._.viewportRatio.height = y / freeSpace.height;
 			}
 			// Save the current position.
 			this._.position = { x: x, y: y };

From 3c87248ce7b2b6d2cd3bd11629a594afce991c84 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 12:31:16 +0100
Subject: [PATCH 33/77] Changelog: added dialog plugin link.

---
 CHANGES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.md b/CHANGES.md
index e9238818adf..093567f8d4c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -29,6 +29,7 @@ Fixed Issues:
 * [#3379](/~https://github.com/ckeditor/ckeditor-dev/issues/3379): Fixed: Incorrect [`CKEDITOR.editor#getData`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getData) call when inserting content into the editor.
 * [#3136](/~https://github.com/ckeditor/ckeditor-dev/issues/3136) [Firefox] Fixed: Clicking on [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) items removes native table selection.
 * [#3381](/~https://github.com/ckeditor/ckeditor-dev/issues/3381): [IE8] Fixed: [`CKEDITOR.tools.object.keys`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) does not accept non-objects.
+* [#2395](/~https://github.com/ckeditor/ckeditor-dev/issues/2395): Fixed: focused input in [dialog](https://ckeditor.com/cke4/addon/dialog) is scrolled out of viewport when soft keyboard appears.
 
 API Changes:
 

From ed628c4a5f6a82023f5e7ae96c2a4c439188b7db Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 13:22:50 +0100
Subject: [PATCH 34/77] Merged two line comment into one line.

---
 plugins/dialog/plugin.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 8731ee04807..342ff4cdf78 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2123,8 +2123,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 	}
 
-	// Caching reusable covers and allowing only one cover
-	// on screen.
+	// Caching reusable covers and allowing only one cover on screen.
 	var covers = {},
 		currentCover;
 

From ab7fd74e77194af1ca09e6151325db6bafc4c56a Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 13:23:52 +0100
Subject: [PATCH 35/77] Tests: updated version tag.

---
 tests/plugins/dialog/manual/skins/kama.md      | 2 +-
 tests/plugins/dialog/manual/skins/moono.md     | 2 +-
 tests/plugins/dialog/manual/skins/moonolisa.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/plugins/dialog/manual/skins/kama.md b/tests/plugins/dialog/manual/skins/kama.md
index d3d63bfc467..3c0805d514b 100644
--- a/tests/plugins/dialog/manual/skins/kama.md
+++ b/tests/plugins/dialog/manual/skins/kama.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.10.2
+@bender-tags: 2395, bug, 4.11.2
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
diff --git a/tests/plugins/dialog/manual/skins/moono.md b/tests/plugins/dialog/manual/skins/moono.md
index d3d63bfc467..3c0805d514b 100644
--- a/tests/plugins/dialog/manual/skins/moono.md
+++ b/tests/plugins/dialog/manual/skins/moono.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.10.2
+@bender-tags: 2395, bug, 4.11.2
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
diff --git a/tests/plugins/dialog/manual/skins/moonolisa.md b/tests/plugins/dialog/manual/skins/moonolisa.md
index d3d63bfc467..3c0805d514b 100644
--- a/tests/plugins/dialog/manual/skins/moonolisa.md
+++ b/tests/plugins/dialog/manual/skins/moonolisa.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.10.2
+@bender-tags: 2395, bug, 4.11.2
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 236396aa52a5df342babb28d943bbfa2e2bfe53b Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 13:56:33 +0100
Subject: [PATCH 36/77] Tests: added missing ticket reference.

---
 tests/plugins/dialog/positioning.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index e438ff2a849..06983f6fa2c 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -142,6 +142,7 @@
 			} );
 		},
 
+		// (#2395)
 		'test dialog resize': function() {
 			this.editorBot.dialog( 'link', function( dialog ) {
 				var dialogSize = dialog.getSize(),

From 3dab48d2c7bd85b3381ce18e65ce5a7831c043c0 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 14:02:15 +0100
Subject: [PATCH 37/77] Tests: fixed test failing when run form dashboard.
 Extracted duplicate code into separate function.

---
 tests/plugins/dialog/positioning.js | 34 +++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 06983f6fa2c..6d38990da69 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -85,18 +85,11 @@
 		// +----------------------------------+
 		//
 		'test dialog move': function() {
-			var window = CKEDITOR.document.getWindow(),
-				viewPaneSize = {
+			var viewPaneSize = {
 					width: 1000,
 					height: 1000
 				},
-				stubs = {
-					getWindow: sinon.stub( CKEDITOR.document, 'getWindow' ),
-					getViewPane: sinon.stub( window, 'getViewPaneSize' )
-				};
-
-			stubs.getWindow.returns( window );
-			stubs.getViewPane.returns( viewPaneSize );
+				stubs = mockWindowGetViewPaneSize( viewPaneSize );
 
 			this.editorBot.dialog( 'link', function( dialog ) {
 				var element = dialog._.element.getFirst(),
@@ -144,6 +137,12 @@
 
 		// (#2395)
 		'test dialog resize': function() {
+			var viewPaneSize = {
+					width: 1000,
+					height: 1000
+				},
+				stubs = mockWindowGetViewPaneSize( viewPaneSize );
+
 			this.editorBot.dialog( 'link', function( dialog ) {
 				var dialogSize = dialog.getSize(),
 					resizer = dialog._.element.findOne( '.cke_resizer' ),
@@ -169,10 +168,27 @@
 					height: dialog.getSize().height - dialogSize.height
 				};
 
+				for ( var key in stubs ) {
+					stubs[ key ].restore();
+				}
+
 				// When resizing some floats might be rounded.
 				assert.isNumberInRange( 10, sizeChange.width - 1, sizeChange.width );
 				assert.isNumberInRange( 10, sizeChange.height - 1, sizeChange.height );
 			} );
 		}
 	} );
+
+	function mockWindowGetViewPaneSize( viewPaneSize ) {
+		var window = CKEDITOR.document.getWindow(),
+			stubs = {
+				getWindow: sinon.stub( CKEDITOR.document, 'getWindow' ),
+				getViewPane: sinon.stub( window, 'getViewPaneSize' )
+			};
+
+		stubs.getWindow.returns( window );
+		stubs.getViewPane.returns( viewPaneSize );
+
+		return stubs;
+	}
 } )();

From 1cff428baadf6d608f58cb53fbf8af97e3aecc31 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 14:20:13 +0100
Subject: [PATCH 38/77] Tests: ignored on mobiles.

---
 tests/plugins/dialog/positioning.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 6d38990da69..ec5d403de6f 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -137,6 +137,10 @@
 
 		// (#2395)
 		'test dialog resize': function() {
+			// Mobile browsers doesn't support dialog resize.
+			if ( bender.tools.env.mobile ) {
+				assert.ignore();
+			}
 			var viewPaneSize = {
 					width: 1000,
 					height: 1000

From 21576a9beddcd386ea76ade1b651d2db87328024 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 15:29:48 +0100
Subject: [PATCH 39/77] Tests: fixed failing test on IE8.

---
 tests/plugins/dialog/positioning.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index ec5d403de6f..2ace0050266 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -150,12 +150,21 @@
 			this.editorBot.dialog( 'link', function( dialog ) {
 				var dialogSize = dialog.getSize(),
 					resizer = dialog._.element.findOne( '.cke_resizer' ),
+					evt = {
+						screenX: 0,
+						screenY: 0
+					},
 					sizeChange;
 
-				resizer.$.onmousedown( {
-					screenX: 0,
-					screenY: 0
-				} );
+				// IE8 doesn't pass fake evt when manually calling resizer.$.onmousedown.
+				if ( CKEDITOR.env.ie && CKEDITOR.env.version < 9 ) {
+					var str = resizer.$.onmousedown.toString();
+					str = str.match( /[(](.*?),/ )[ 1 ];
+
+					CKEDITOR.tools.callFunction( Number( str ), evt );
+				} else {
+					resizer.$.onmousedown( evt );
+				}
 
 				CKEDITOR.document.fire( 'mousemove', {
 					$: {

From b97517e2bcc3292c9c456b537bd62fa0a3028ccd Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 15:41:09 +0100
Subject: [PATCH 40/77] Tests: added rtl editor.

---
 tests/plugins/dialog/manual/inputfocus.html | 6 ++++++
 tests/plugins/dialog/manual/inputfocus.md   | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/inputfocus.html b/tests/plugins/dialog/manual/inputfocus.html
index e2ab1a44332..2a93e1d14c8 100644
--- a/tests/plugins/dialog/manual/inputfocus.html
+++ b/tests/plugins/dialog/manual/inputfocus.html
@@ -4,9 +4,15 @@
 	}
 </style>
 <div class="spacer"></div>
+<h1>Left to right editor:</h1>
 <textarea id="editor"></textarea>
+<h1>Right to left editor:</h1>
+<textarea id="editor_rtl"></textarea>
 <div class="spacer"></div>
 
 <script>
 	CKEDITOR.replace( 'editor' );
+	CKEDITOR.replace( 'editor_rtl', {
+		language: 'he'
+	} );
 </script>
diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index 711a23ce6b9..8e3226dce8e 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -2,6 +2,8 @@
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
+## Test both editors:
+
 1. Scroll down until editor is visible.
 1. Press link button.
 
@@ -30,7 +32,7 @@
 
 - When dialog is shown scrollbars are invisible.
 - When resizing browser window dialog is still horizontally and vertically centered.
-- When window too small to fit dialog window scrollbars should appear allowing to scroll dialog.
+- When window is too small to fit dialog window scrollbars should appear allowing to scroll dialog.
 - Dialog window can be resized and dragged around.
 - When closing and reopening dialog it has same size and position as it had before when it was closed.
 

From 7a666af7cacd243cea822b50437da62e7c6e23d1 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 9 Nov 2018 15:43:11 +0100
Subject: [PATCH 41/77] Tests: split test into two, one for mobiles and one for
 desktops.

---
 tests/plugins/dialog/manual/inputfocus.html   |  3 +++
 tests/plugins/dialog/manual/inputfocus.md     | 14 -------------
 .../dialog/manual/inputfocusmobile.html       | 21 +++++++++++++++++++
 .../plugins/dialog/manual/inputfocusmobile.md | 21 +++++++++++++++++++
 4 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 tests/plugins/dialog/manual/inputfocusmobile.html
 create mode 100644 tests/plugins/dialog/manual/inputfocusmobile.md

diff --git a/tests/plugins/dialog/manual/inputfocus.html b/tests/plugins/dialog/manual/inputfocus.html
index 2a93e1d14c8..3b198cbe022 100644
--- a/tests/plugins/dialog/manual/inputfocus.html
+++ b/tests/plugins/dialog/manual/inputfocus.html
@@ -11,6 +11,9 @@ <h1>Right to left editor:</h1>
 <div class="spacer"></div>
 
 <script>
+	if ( bender.tools.env.mobile ) {
+		bender.ignore();
+	}
 	CKEDITOR.replace( 'editor' );
 	CKEDITOR.replace( 'editor_rtl', {
 		language: 'he'
diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index 8e3226dce8e..6e59c0b4392 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -9,20 +9,6 @@
 
 ## Things to check:
 
-### Touch devices:
-
-- Play around focusing and blurring inputs, zooming and scrolling page.
-
-#### Expected:
-
-- When opening dialog or focusing input caret page should be scrolled in a way caret is visible.
-
-#### Unexpected
-
-- Caret is outside of current viewport.
-
-### Desktop computers:
-
 - Resize browser window.
 - Resize dialog window.
 - Drag dialog window.
diff --git a/tests/plugins/dialog/manual/inputfocusmobile.html b/tests/plugins/dialog/manual/inputfocusmobile.html
new file mode 100644
index 00000000000..5d755114cef
--- /dev/null
+++ b/tests/plugins/dialog/manual/inputfocusmobile.html
@@ -0,0 +1,21 @@
+<style>
+	.spacer {
+		height: 2000px;
+	}
+</style>
+<div class="spacer"></div>
+<h1>Left to right editor:</h1>
+<textarea id="editor"></textarea>
+<h1>Right to left editor:</h1>
+<textarea id="editor_rtl"></textarea>
+<div class="spacer"></div>
+
+<script>
+	if ( !bender.tools.env.mobile ) {
+		bender.ignore();
+	}
+	CKEDITOR.replace( 'editor' );
+	CKEDITOR.replace( 'editor_rtl', {
+		language: 'he'
+	} );
+</script>
diff --git a/tests/plugins/dialog/manual/inputfocusmobile.md b/tests/plugins/dialog/manual/inputfocusmobile.md
new file mode 100644
index 00000000000..0dcf8e1eddd
--- /dev/null
+++ b/tests/plugins/dialog/manual/inputfocusmobile.md
@@ -0,0 +1,21 @@
+@bender-tags: 2395, bug, 4.11.0
+@bender-ui: collapsed
+@bender-ckeditor-plugins: wysiwygarea, toolbar, link
+
+## Test both editors:
+
+1. Scroll down until editor is visible.
+1. Press link button.
+
+## Things to check:
+
+
+- Play around focusing and blurring inputs, zooming and scrolling page.
+
+#### Expected:
+
+- When opening dialog or focusing input caret page should be scrolled in a way caret is visible.
+
+#### Unexpected
+
+- Caret is outside of current viewport.

From bce7594b8e31938e207c11653f8f49b7ad9c3099 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 9 Jan 2019 14:11:33 +0100
Subject: [PATCH 42/77] Extracted repeated conditional to useFlex variable.

---
 plugins/dialog/plugin.js | 57 ++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 342ff4cdf78..9d87f23e405 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -135,33 +135,34 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		input && input.removeAttribute( 'aria-invalid' );
 	}
 
-	var templateSource = '<div class="cke_reset_all cke_dialog_container {editorId} {editorDialogClass} {hidpi}' +
-		'" dir="{langDir}"' +
-		' style="' + ( !CKEDITOR.env.ie || CKEDITOR.env.edge ? 'display:flex' : '' ) + '"' +
-		' lang="{langCode}"' +
-		' role="dialog"' +
-		' aria-labelledby="cke_dialog_title_{id}"' +
-		'>' +
-		'<table class="cke_dialog ' + CKEDITOR.env.cssClass + ' cke_{langDir}"' +
-			' style="' + ( !CKEDITOR.env.ie || CKEDITOR.env.edge ? 'margin:auto' : 'position:absolute' ) + '"' +
-			' role="presentation">' +
-			'<tr><td role="presentation">' +
-			'<div class="cke_dialog_body" role="presentation">' +
-				'<div id="cke_dialog_title_{id}" class="cke_dialog_title" role="presentation"></div>' +
-				'<a id="cke_dialog_close_button_{id}" class="cke_dialog_close_button" href="javascript:void(0)" title="{closeTitle}" role="button"><span class="cke_label">X</span></a>' +
-				'<div id="cke_dialog_tabs_{id}" class="cke_dialog_tabs" role="tablist"></div>' +
-				'<table class="cke_dialog_contents" role="presentation">' +
-				'<tr>' +
-					'<td id="cke_dialog_contents_{id}" class="cke_dialog_contents_body" role="presentation"></td>' +
-				'</tr>' +
-				'<tr>' +
-					'<td id="cke_dialog_footer_{id}" class="cke_dialog_footer" role="presentation"></td>' +
-				'</tr>' +
-				'</table>' +
-			'</div>' +
-			'</td></tr>' +
-		'</table>' +
-		'</div>';
+	var useFlex = !CKEDITOR.env.ie || CKEDITOR.env.edge,
+		templateSource = '<div class="cke_reset_all cke_dialog_container {editorId} {editorDialogClass} {hidpi}' +
+			'" dir="{langDir}"' +
+			' style="' + ( useFlex ? 'display:flex' : '' ) + '"' +
+			' lang="{langCode}"' +
+			' role="dialog"' +
+			' aria-labelledby="cke_dialog_title_{id}"' +
+			'>' +
+			'<table class="cke_dialog ' + CKEDITOR.env.cssClass + ' cke_{langDir}"' +
+				' style="' + ( useFlex ? 'margin:auto' : 'position:absolute' ) + '"' +
+				' role="presentation">' +
+				'<tr><td role="presentation">' +
+				'<div class="cke_dialog_body" role="presentation">' +
+					'<div id="cke_dialog_title_{id}" class="cke_dialog_title" role="presentation"></div>' +
+					'<a id="cke_dialog_close_button_{id}" class="cke_dialog_close_button" href="javascript:void(0)" title="{closeTitle}" role="button"><span class="cke_label">X</span></a>' +
+					'<div id="cke_dialog_tabs_{id}" class="cke_dialog_tabs" role="tablist"></div>' +
+					'<table class="cke_dialog_contents" role="presentation">' +
+					'<tr>' +
+						'<td id="cke_dialog_contents_{id}" class="cke_dialog_contents_body" role="presentation"></td>' +
+					'</tr>' +
+					'<tr>' +
+						'<td id="cke_dialog_footer_{id}" class="cke_dialog_footer" role="presentation"></td>' +
+					'</tr>' +
+					'</table>' +
+				'</div>' +
+				'</td></tr>' +
+			'</table>' +
+			'</div>';
 
 	function buildDialog( editor ) {
 		var element = CKEDITOR.dom.element.createFromHtml( CKEDITOR.addTemplate( 'dialog', templateSource ).output( {
@@ -963,7 +964,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		layout: function() {
 			var el = this.parts.dialog;
 
-			if ( !this._.moved && ( !CKEDITOR.env.ie || CKEDITOR.env.edge ) ) {
+			if ( !this._.moved && ( useFlex ) ) {
 				return;
 			}
 

From c3b1cf015159d5e6bcb8aa355370aa54fba07d64 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 9 Jan 2019 15:11:08 +0100
Subject: [PATCH 43/77] Tests: updated version tags.

---
 tests/plugins/dialog/manual/inputfocus.md       | 2 +-
 tests/plugins/dialog/manual/inputfocusmobile.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index 6e59c0b4392..3989dd4247f 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.11.0
+@bender-tags: 2395, bug, 4.12.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
diff --git a/tests/plugins/dialog/manual/inputfocusmobile.md b/tests/plugins/dialog/manual/inputfocusmobile.md
index 0dcf8e1eddd..4d9fdab0440 100644
--- a/tests/plugins/dialog/manual/inputfocusmobile.md
+++ b/tests/plugins/dialog/manual/inputfocusmobile.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.11.0
+@bender-tags: 2395, bug, 4.12.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 4c307b985fab98bde87926b63c6620de7a86b3ae Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 9 Jan 2019 15:41:40 +0100
Subject: [PATCH 44/77] Tests: rephraased test steps.

---
 tests/plugins/dialog/manual/inputfocus.md       | 16 ++++++----------
 tests/plugins/dialog/manual/inputfocusmobile.md | 17 +++++------------
 tests/plugins/dialog/manual/skins/kama.md       |  2 +-
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index 3989dd4247f..e893286d067 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -2,19 +2,15 @@
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
-## Test both editors:
-
+1. Read expected.
 1. Scroll down until editor is visible.
 1. Press link button.
+1. Resize browser window.
+1. Resize dialog window.
+1. Drag dialog window.
+1. Close and reopen dialog.
 
-## Things to check:
-
-- Resize browser window.
-- Resize dialog window.
-- Drag dialog window.
-- Close and reopen dialog.
-
-#### Expected:
+## Expected
 
 - When dialog is shown scrollbars are invisible.
 - When resizing browser window dialog is still horizontally and vertically centered.
diff --git a/tests/plugins/dialog/manual/inputfocusmobile.md b/tests/plugins/dialog/manual/inputfocusmobile.md
index 4d9fdab0440..0dac3067edc 100644
--- a/tests/plugins/dialog/manual/inputfocusmobile.md
+++ b/tests/plugins/dialog/manual/inputfocusmobile.md
@@ -2,20 +2,13 @@
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
-## Test both editors:
+1. Scroll down until editor is visible and press link button.
+1. Focus other input in dialog.
 
-1. Scroll down until editor is visible.
-1. Press link button.
+## Expected:
 
-## Things to check:
+- After each step page should be scrolled in a way caret is visible.
 
-
-- Play around focusing and blurring inputs, zooming and scrolling page.
-
-#### Expected:
-
-- When opening dialog or focusing input caret page should be scrolled in a way caret is visible.
-
-#### Unexpected
+## Unexpected
 
 - Caret is outside of current viewport.
diff --git a/tests/plugins/dialog/manual/skins/kama.md b/tests/plugins/dialog/manual/skins/kama.md
index 3c0805d514b..37380aea235 100644
--- a/tests/plugins/dialog/manual/skins/kama.md
+++ b/tests/plugins/dialog/manual/skins/kama.md
@@ -2,4 +2,4 @@
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
-Play around with dialog window to see if it's styling looks correct with no visible glitches.
+Press link button and play around with dialog window to see if it's styling looks correct with no visible glitches.

From 82b9eb3493836ddc3570cc31e9a44f3f95362c6b Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 9 Jan 2019 15:48:32 +0100
Subject: [PATCH 45/77] Tests: added empty lines between each test.

---
 tests/plugins/dialog/positioning.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 2ace0050266..6e4b7d6bfce 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -17,6 +17,7 @@
 				dialog.hide();
 			}
 		},
+
 		// (#2395).
 		'test body has hidden scrollbars when dialog is opened': function() {
 			if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
@@ -33,6 +34,7 @@
 				assert.isFalse( body.hasClass( 'cke_dialog_open' ), 'Body shouldn\'t have class.' );
 			} );
 		},
+
 		// (#2395).
 		'test dialog is initially centered': function() {
 			if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
@@ -47,6 +49,7 @@
 				assert.areEqual( element.getStyle( 'margin' ), 'auto', 'Dialog element should have `margin:auto`.' );
 			} );
 		},
+
 		// (#2395).
 		'test dialog cover styles': function() {
 			this.editorBot.dialog( 'link', function() {
@@ -56,6 +59,7 @@
 				assert.areEqual( cover.getStyle( 'height' ), '100%', 'Dialog element should have `height:100%`.' );
 			} );
 		},
+
 		// When drag starts, dialog becomes centered with `position:absolute`, then it moves together with mouse (#2395).
 		//
 		// A - mouse cursor

From 4d1c17ca2441bc07491f1973c2ba3b938558b34e Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 7 Mar 2019 17:30:51 +0100
Subject: [PATCH 46/77] Tests: updated version tag.

---
 tests/plugins/dialog/manual/skins/kama.md      | 2 +-
 tests/plugins/dialog/manual/skins/moono.md     | 2 +-
 tests/plugins/dialog/manual/skins/moonolisa.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/plugins/dialog/manual/skins/kama.md b/tests/plugins/dialog/manual/skins/kama.md
index 37380aea235..687ceab9d7d 100644
--- a/tests/plugins/dialog/manual/skins/kama.md
+++ b/tests/plugins/dialog/manual/skins/kama.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.11.2
+@bender-tags: 2395, bug, 4.12.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
diff --git a/tests/plugins/dialog/manual/skins/moono.md b/tests/plugins/dialog/manual/skins/moono.md
index 3c0805d514b..6fa4b4d2bfe 100644
--- a/tests/plugins/dialog/manual/skins/moono.md
+++ b/tests/plugins/dialog/manual/skins/moono.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.11.2
+@bender-tags: 2395, bug, 4.12.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 
diff --git a/tests/plugins/dialog/manual/skins/moonolisa.md b/tests/plugins/dialog/manual/skins/moonolisa.md
index 3c0805d514b..6fa4b4d2bfe 100644
--- a/tests/plugins/dialog/manual/skins/moonolisa.md
+++ b/tests/plugins/dialog/manual/skins/moonolisa.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.11.2
+@bender-tags: 2395, bug, 4.12.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From c92c917f7a7993d17a14905e1d1c10aec3c99431 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 11:14:10 +0200
Subject: [PATCH 47/77] Unwrap redundant IIFE.

---
 plugins/dialog/plugin.js | 53 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 9d87f23e405..ad4ef90537d 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -734,35 +734,36 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		 * @param {Number} width The width of the dialog in pixels.
 		 * @param {Number} height The height of the dialog in pixels.
 		 */
-		resize: ( function() {
-			return function( width, height ) {
-				if ( this._.contentSize && this._.contentSize.width == width && this._.contentSize.height == height )
-					return;
+		resize: function( width, height ) {
+			if ( this._.contentSize && this._.contentSize.width == width && this._.contentSize.height == height )
+				return;
 
-				CKEDITOR.dialog.fire( 'resize', {
-					dialog: this,
-					width: width,
-					height: height
-				}, this._.editor );
-
-				this.fire( 'resize', {
-					width: width,
-					height: height
-				}, this._.editor );
-
-				var contents = this.parts.contents;
-				contents.setStyles( {
-					width: width + 'px',
-					height: height + 'px'
-				} );
+			CKEDITOR.dialog.fire( 'resize', {
+				dialog: this,
+				width: width,
+				height: height
+			}, this._.editor );
+
+			this.fire( 'resize', {
+				width: width,
+				height: height
+			}, this._.editor );
+
+			var contents = this.parts.contents;
+			contents.setStyles( {
+				width: width + 'px',
+				height: height + 'px'
+			} );
 
-				// Update dialog position when dimension get changed in RTL.
-				if ( this._.editor.lang.dir == 'rtl' && this._.position )
-					this._.position.x = CKEDITOR.document.getWindow().getViewPaneSize().width - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
+			// Update dialog position when dimension get changed in RTL.
+			if ( this._.editor.lang.dir == 'rtl' && this._.position ) {
+				var viewPaneWidth = CKEDITOR.document.getWindow().getViewPaneSize().width;
 
-				this._.contentSize = { width: width, height: height };
-			};
-		} )(),
+				this._.position.x = viewPaneWidth - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
+			}
+
+			this._.contentSize = { width: width, height: height };
+		},
 
 		/**
 		 * Gets the current size of the dialog in pixels.

From e051502d6b0ec82b30cd1ea33cda36083c3505af Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 11:16:10 +0200
Subject: [PATCH 48/77] Remove redundant doubled brackets, add if braces.

---
 plugins/dialog/plugin.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index ad4ef90537d..37488100f9e 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2087,18 +2087,22 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				right = rtl && element.getComputedStyle( 'right' ),
 				position = dialog.getPosition();
 
-			if ( position.y + internalHeight > viewSize.height )
+			if ( position.y + internalHeight > viewSize.height ) {
 				internalHeight = viewSize.height - position.y;
+			}
 
-			if ( ( rtl ? right : position.x ) + internalWidth > viewSize.width )
+			if ( ( rtl ? right : position.x ) + internalWidth > viewSize.width ) {
 				internalWidth = viewSize.width - ( rtl ? right : position.x );
+			}
 
 			// Make sure the dialog will not be resized to the wrong side when it's in the leftmost position for RTL.
-			if ( ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) )
+			if ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) {
 				width = Math.max( def.minWidth || 0, internalWidth - wrapperWidth );
+			}
 
-			if ( resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT || resizable == CKEDITOR.DIALOG_RESIZE_BOTH )
+			if ( resizable == CKEDITOR.DIALOG_RESIZE_HEIGHT || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) {
 				height = Math.max( def.minHeight || 0, internalHeight - wrapperHeight );
+			}
 
 			dialog.resize( width, height );
 

From 9fea79b27d4c3f2bc5c913acef011195e3ccd331 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 14:49:31 +0200
Subject: [PATCH 49/77] Fixed: dialog can be resized out of viewport.

---
 plugins/dialog/plugin.js | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 37488100f9e..f986306ff42 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -987,6 +987,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				el.removeStyle( 'margin' );
 			}
 
+			posX = Math.floor( posX );
+			posY = Math.floor( posY );
+
 			this.move( posX, posY );
 		},
 
@@ -1953,19 +1956,24 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			abstractDialogCoords.x += dx;
 			abstractDialogCoords.y += dy;
 
-			if ( abstractDialogCoords.x + margins[ 3 ] < magnetDistance )
+			if ( abstractDialogCoords.x + margins[ 3 ] < magnetDistance ) {
 				realX = -margins[ 3 ];
-			else if ( abstractDialogCoords.x - margins[ 1 ] > viewPaneSize.width - dialogSize.width - magnetDistance )
+			} else if ( abstractDialogCoords.x - margins[ 1 ] > viewPaneSize.width - dialogSize.width - magnetDistance ) {
 				realX = viewPaneSize.width - dialogSize.width + ( editor.lang.dir == 'rtl' ? 0 : margins[ 1 ] );
-			else
+			} else {
 				realX = abstractDialogCoords.x;
+			}
 
-			if ( abstractDialogCoords.y + margins[ 0 ] < magnetDistance )
+			if ( abstractDialogCoords.y + margins[ 0 ] < magnetDistance ) {
 				realY = -margins[ 0 ];
-			else if ( abstractDialogCoords.y - margins[ 2 ] > viewPaneSize.height - dialogSize.height - magnetDistance )
+			} else if ( abstractDialogCoords.y - margins[ 2 ] > viewPaneSize.height - dialogSize.height - magnetDistance ) {
 				realY = viewPaneSize.height - dialogSize.height + margins[ 2 ];
-			else
+			} else {
 				realY = abstractDialogCoords.y;
+			}
+
+			realX = Math.floor( realX );
+			realY = Math.floor( realY );
 
 			dialog.move( realX, realY, 1 );
 
@@ -2033,9 +2041,15 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				content.append( dialogCover );
 			}
 
+			var isBorderBox = !( CKEDITOR.env.gecko || CKEDITOR.env.ie && CKEDITOR.env.quirks ),
+				heightStyle = content.getStyle( 'height' ),
+				widthStyle = content.getStyle( 'width' ),
+				toPx = CKEDITOR.tools.convertToPx;
+
 			// Calculate the offset between content and chrome size.
-			wrapperHeight = startSize.height - dialog.parts.contents.getSize( 'height', !( CKEDITOR.env.gecko || CKEDITOR.env.ie && CKEDITOR.env.quirks ) );
-			wrapperWidth = startSize.width - dialog.parts.contents.getSize( 'width', 1 );
+			// Use inline style, because of (#3144), fallback to `element.getSize`.
+			wrapperHeight = startSize.height - ( heightStyle ? toPx( heightStyle ) : content.getSize( 'height', isBorderBox ) );
+			wrapperWidth = startSize.width - ( widthStyle ? toPx( widthStyle ) : content.getSize( 'width', 1 ) );
 
 			origin = { x: $event.screenX, y: $event.screenY };
 
@@ -2095,6 +2109,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				internalWidth = viewSize.width - ( rtl ? right : position.x );
 			}
 
+			internalHeight = Math.floor( internalHeight );
+			internalWidth = Math.floor( internalWidth );
+
 			// Make sure the dialog will not be resized to the wrong side when it's in the leftmost position for RTL.
 			if ( resizable == CKEDITOR.DIALOG_RESIZE_WIDTH || resizable == CKEDITOR.DIALOG_RESIZE_BOTH ) {
 				width = Math.max( def.minWidth || 0, internalWidth - wrapperWidth );

From 4f8e0a5a0262c9dff6d3fd02b8e6075040327a61 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 15:22:24 +0200
Subject: [PATCH 50/77] Fallback position to 0.

---
 plugins/dialog/plugin.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index f986306ff42..2ad094ca489 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2101,6 +2101,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				right = rtl && element.getComputedStyle( 'right' ),
 				position = dialog.getPosition();
 
+			position.x = position.x || 0;
+			position.y = position.y || 0;
+
 			if ( position.y + internalHeight > viewSize.height ) {
 				internalHeight = viewSize.height - position.y;
 			}

From 0c40070326e5d5052e96f789850e123c3ef6aa4b Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 16:15:20 +0200
Subject: [PATCH 51/77] Fix positioning of dragged dialog after resize.

---
 plugins/dialog/plugin.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 2ad094ca489..42bf6386e4b 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -259,7 +259,11 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			contents: {},
 			buttons: {},
 			accessKeyMap: {},
-			viewportRatio: {},
+			// Default value is 0.5 which means centered dialog.
+			viewportRatio: {
+				width: 0.5,
+				height: 0.5
+			},
 
 			// Initialize the tab and page map.
 			tabs: {},
@@ -806,17 +810,19 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
 				dialogSize = this.getSize(),
+				ratios = this._.viewportRatio,
 				freeSpace = {
 					width: Math.max( viewPaneSize.width - dialogSize.width, 0 ),
 					height: Math.max( viewPaneSize.height - dialogSize.height, 0 )
 				};
 			if ( this._.position && this._.position.x == x && this._.position.y == y ) {
 				// If position didn't change window might have been resized.
-				x = freeSpace.width * this._.viewportRatio.width;
-				y = freeSpace.height * this._.viewportRatio.height;
+				x = freeSpace.width * ratios.width;
+				y = freeSpace.height * ratios.height;
 			} else {
-				this._.viewportRatio.width = x / freeSpace.width;
-				this._.viewportRatio.height = y / freeSpace.height;
+				// When no free space don't divide by zero, use previous value.
+				ratios.width = freeSpace.width ? ( x / freeSpace.width ) : ratios.width;
+				ratios.height = freeSpace.height ? ( y / freeSpace.height ) : ratios.height;
 			}
 			// Save the current position.
 			this._.position = { x: x, y: y };

From 5b68c703513940d39212afc2560d7da08adfd003 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 16:27:53 +0200
Subject: [PATCH 52/77] Move dialog specific styles from skins, to plugin
 stylesheet.

---
 plugins/dialog/plugin.js         |  7 +++++++
 plugins/dialog/styles/dialog.css | 14 ++++++++++++++
 skins/kama/dialog.css            | 15 ---------------
 skins/moono-lisa/dialog.css      | 15 ---------------
 skins/moono/dialog.css           | 14 --------------
 5 files changed, 21 insertions(+), 44 deletions(-)
 create mode 100644 plugins/dialog/styles/dialog.css

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 42bf6386e4b..18dad3193d0 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -3394,9 +3394,16 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	} );
 } )();
 
+var stylesLoaded = false;
+
 CKEDITOR.plugins.add( 'dialog', {
 	requires: 'dialogui',
 	init: function( editor ) {
+		if ( !stylesLoaded ) {
+			CKEDITOR.document.appendStyleSheet( this.path + 'styles/dialog.css' );
+			stylesLoaded = true;
+		}
+
 		editor.on( 'doubleclick', function( evt ) {
 			if ( evt.data.dialog )
 				editor.openDialog( evt.data.dialog );
diff --git a/plugins/dialog/styles/dialog.css b/plugins/dialog/styles/dialog.css
new file mode 100644
index 00000000000..08b87f1bf05
--- /dev/null
+++ b/plugins/dialog/styles/dialog.css
@@ -0,0 +1,14 @@
+.cke_dialog_open {
+	overflow: hidden;
+}
+
+.cke_dialog_container {
+	position: fixed;
+	overflow-y: auto;
+	overflow-x: auto;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	z-index: 10010;
+}
diff --git a/skins/kama/dialog.css b/skins/kama/dialog.css
index e0ac2938384..f547e9c84aa 100644
--- a/skins/kama/dialog.css
+++ b/skins/kama/dialog.css
@@ -897,18 +897,3 @@ a.cke_smile:hover img
 	width:100%;
 	height:100%;
 }
-
-.cke_dialog_open {
-	overflow: hidden;
-}
-
-.cke_dialog_container {
-	position: fixed;
-	overflow-y: auto;
-	overflow-x: auto;
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	z-index: 10010;
-}
diff --git a/skins/moono-lisa/dialog.css b/skins/moono-lisa/dialog.css
index 0be7dcef148..924d276e506 100644
--- a/skins/moono-lisa/dialog.css
+++ b/skins/moono-lisa/dialog.css
@@ -1157,18 +1157,3 @@ a.cke_dialog_ui_button.cke_dialog_image_browse
 	border: 2px solid #139FF7;
 	padding: 6px;
 }
-
-.cke_dialog_open {
-	overflow: hidden;
-}
-
-.cke_dialog_container {
-	position: fixed;
-	overflow-y: auto;
-	overflow-x: auto;
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	z-index: 10010;
-}
diff --git a/skins/moono/dialog.css b/skins/moono/dialog.css
index 0ad0de58687..d23e581fb59 100644
--- a/skins/moono/dialog.css
+++ b/skins/moono/dialog.css
@@ -1064,17 +1064,3 @@ a.cke_specialchar:active
 	height: 100%;
 }
 
-.cke_dialog_open {
-	overflow: hidden;
-}
-
-.cke_dialog_container {
-	position: fixed;
-	overflow-y: auto;
-	overflow-x: auto;
-	width: 100%;
-	height: 100%;
-	top: 0;
-	left: 0;
-	z-index: 10010;
-}

From 7c8d86cb41f6180e3a2839ac6ffe8f72900ea52b Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Thu, 30 May 2019 16:47:37 +0200
Subject: [PATCH 53/77] Revert improvements to dialog tab list styling, because
 it would be not working with third-party skins.

---
 plugins/dialog/styles/dialog.css | 4 ++++
 skins/kama/dialog.css            | 1 -
 skins/moono-lisa/dialog.css      | 9 +++++----
 skins/moono/dialog.css           | 2 --
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/dialog/styles/dialog.css b/plugins/dialog/styles/dialog.css
index 08b87f1bf05..add83eb2258 100644
--- a/plugins/dialog/styles/dialog.css
+++ b/plugins/dialog/styles/dialog.css
@@ -12,3 +12,7 @@
 	left: 0;
 	z-index: 10010;
 }
+
+.cke_dialog_body {
+	position: relative;
+}
diff --git a/skins/kama/dialog.css b/skins/kama/dialog.css
index f547e9c84aa..17f834fd2d5 100644
--- a/skins/kama/dialog.css
+++ b/skins/kama/dialog.css
@@ -55,7 +55,6 @@ Comments in this file will give more details about each of the above blocks.
 	padding: 5px;
 	background-color: #fff;
 	border-radius: 5px;
-	position: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */
diff --git a/skins/moono-lisa/dialog.css b/skins/moono-lisa/dialog.css
index 924d276e506..1e13fa70e7b 100644
--- a/skins/moono-lisa/dialog.css
+++ b/skins/moono-lisa/dialog.css
@@ -52,7 +52,6 @@ Comments in this file will give more details about each of the above blocks.
 {
 	z-index: 1;
 	background: #fff;
-	position: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */
@@ -136,7 +135,7 @@ Comments in this file will give more details about each of the above blocks.
 	background-color: #fff;
 	overflow: auto;
 	padding: 15px 10px 5px 10px;
-	margin-top: 1px;
+	margin-top: 43px;
 	border-top: 1px solid #d1d1d1;
 }
 
@@ -210,14 +209,16 @@ The .cke_dialog_tab_selected class is appended to the active tab.
 {
 	height: 33px;
 	display: inline-block;
-	margin: 9px 0 0 11px;
+	margin: 9px 0 0;
+	position: absolute;
 	z-index: 2;
+	left: 11px;
 }
 
 .cke_rtl .cke_dialog_tabs
 {
 	left: auto;
-	margin-right: 11px;
+	right: 11px;
 }
 
 /* A single tab (an <a> element). */
diff --git a/skins/moono/dialog.css b/skins/moono/dialog.css
index d23e581fb59..3d083ae0df7 100644
--- a/skins/moono/dialog.css
+++ b/skins/moono/dialog.css
@@ -56,7 +56,6 @@ Comments in this file will give more details about each of the above blocks.
 	border-bottom-color: #999;
 	border-radius: 3px;
 	box-shadow: 0 0 3px rgba(0, 0, 0, .15);
-	position: relative;
 }
 
 /* Due to our reset we have to recover the styles of some elements. */
@@ -1063,4 +1062,3 @@ a.cke_specialchar:active
 	width: 100%;
 	height: 100%;
 }
-

From aea321e6b189d6810d8f91b82a03bec7c78c835f Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 31 May 2019 10:51:20 +0200
Subject: [PATCH 54/77] Remove redundant brackets.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 18dad3193d0..653b34c54fa 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -971,7 +971,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		layout: function() {
 			var el = this.parts.dialog;
 
-			if ( !this._.moved && ( useFlex ) ) {
+			if ( !this._.moved && useFlex ) {
 				return;
 			}
 

From 3d326d64810ce18a157b15ab1d8ba32cad8fd8dc Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 31 May 2019 10:51:36 +0200
Subject: [PATCH 55/77] Fix type error in IE.

---
 plugins/floatpanel/plugin.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/floatpanel/plugin.js b/plugins/floatpanel/plugin.js
index b1fc8cae791..85a890eaf80 100644
--- a/plugins/floatpanel/plugin.js
+++ b/plugins/floatpanel/plugin.js
@@ -367,15 +367,15 @@ CKEDITOR.plugins.add( 'floatpanel', {
 						// position and horizontal scrolls. Here we have a
 						// series of hacks to workaround it. (https://dev.ckeditor.com/ticket/6146)
 						if ( CKEDITOR.env.ie && !CKEDITOR.env.edge ) {
-							var offsetParent = new CKEDITOR.dom.element( element.$.offsetParent ),
+							var offsetParent = element.$.offsetParent && new CKEDITOR.dom.element( element.$.offsetParent ),
 								scrollParent = offsetParent;
 
 							// Quirks returns <body>, but standards returns <html>.
-							if ( scrollParent.getName() == 'html' ) {
+							if ( scrollParent && scrollParent.getName() == 'html' ) {
 								scrollParent = scrollParent.getDocument().getBody();
 							}
 
-							if ( scrollParent.getComputedStyle( 'direction' ) == 'rtl' ) {
+							if ( scrollParent && scrollParent.getComputedStyle( 'direction' ) == 'rtl' ) {
 								// For IE8, there is not much logic on this, but it works.
 								if ( CKEDITOR.env.ie8Compat ) {
 									left -= element.getDocument().getDocumentElement().$.scrollLeft * 2;

From b2d582bf73746b82e9e53e72816970a67a9e7118 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Fri, 31 May 2019 14:43:45 +0200
Subject: [PATCH 56/77] Remove ie6compat code that became redundant after
 changes.

---
 plugins/dialog/plugin.js | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 653b34c54fa..806af69b15f 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2234,40 +2234,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 		currentCover = coverElement;
 
-		var scrollFunc = function() {
-				var pos = win.getScrollPosition(),
-					cursor = CKEDITOR.dialog._.currentTop;
-				coverElement.setStyles( {
-					left: pos.x + 'px',
-					top: pos.y + 'px'
-				} );
-
-				if ( cursor ) {
-					do {
-						var dialogPos = cursor.getPosition();
-						cursor.move( dialogPos.x, dialogPos.y );
-					} while ( ( cursor = cursor._.parentDialog ) );
-				}
-			};
-
 		// Using Safari/Mac, focus must be kept where it is (https://dev.ckeditor.com/ticket/7027)
 		if ( !( CKEDITOR.env.mac && CKEDITOR.env.webkit ) )
 			coverElement.focus();
-
-		if ( CKEDITOR.env.ie6Compat ) {
-			// IE BUG: win.$.onscroll assignment doesn't work.. it must be window.onscroll.
-			// So we need to invent a really funny way to make it work.
-			var myScrollHandler = function() {
-					scrollFunc();
-					myScrollHandler.prevScrollHandler.apply( this, arguments );
-				};
-			win.$.setTimeout( function() {
-				myScrollHandler.prevScrollHandler = window.onscroll ||
-				function() {};
-				window.onscroll = myScrollHandler;
-			}, 0 );
-			scrollFunc();
-		}
 	}
 
 	function hideCover( editor ) {
@@ -2278,13 +2247,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		editor.focusManager.remove( currentCover );
 		var win = CKEDITOR.document.getWindow();
 		currentCover.hide();
-
-		if ( CKEDITOR.env.ie6Compat ) {
-			win.$.setTimeout( function() {
-				var prevScrollHandler = window.onscroll && window.onscroll.prevScrollHandler;
-				window.onscroll = prevScrollHandler || null;
-			}, 0 );
-		}
 	}
 
 	function removeCovers() {

From f5f31726b8f7ddd3065bdc1e6cbb9276133150cc Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 23 Jul 2019 14:35:17 +0200
Subject: [PATCH 57/77] Tests: update version tag.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Krzysztof Krztoń <k.krzton@cksource.com>
---
 tests/plugins/dialog/manual/inputfocus.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index e893286d067..ba2a151b67f 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.12.0
+@bender-tags: 2395, bug, 4.13.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 9fd73a81c96e4d4c746155cea3c6b2cfdf0171b7 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 23 Jul 2019 14:35:35 +0200
Subject: [PATCH 58/77] Tests: update version tag.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Krzysztof Krztoń <k.krzton@cksource.com>
---
 tests/plugins/dialog/manual/inputfocusmobile.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/inputfocusmobile.md b/tests/plugins/dialog/manual/inputfocusmobile.md
index 0dac3067edc..7dcede2c8c7 100644
--- a/tests/plugins/dialog/manual/inputfocusmobile.md
+++ b/tests/plugins/dialog/manual/inputfocusmobile.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.12.0
+@bender-tags: 2395, bug, 4.13.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 860e70ab7ed7108f92f85dca7b20826ff0097c35 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 23 Jul 2019 14:35:47 +0200
Subject: [PATCH 59/77] Tests: update version tag.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Krzysztof Krztoń <k.krzton@cksource.com>
---
 tests/plugins/dialog/manual/skins/moono.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/skins/moono.md b/tests/plugins/dialog/manual/skins/moono.md
index 6fa4b4d2bfe..e9ae8aa3446 100644
--- a/tests/plugins/dialog/manual/skins/moono.md
+++ b/tests/plugins/dialog/manual/skins/moono.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.12.0
+@bender-tags: 2395, bug, 4.13.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 6b00c4370ec85ac195502cbf7263c5020e41bbe9 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 23 Jul 2019 14:35:58 +0200
Subject: [PATCH 60/77] Tests: update version tag.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Krzysztof Krztoń <k.krzton@cksource.com>
---
 tests/plugins/dialog/manual/skins/moonolisa.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/skins/moonolisa.md b/tests/plugins/dialog/manual/skins/moonolisa.md
index 6fa4b4d2bfe..e9ae8aa3446 100644
--- a/tests/plugins/dialog/manual/skins/moonolisa.md
+++ b/tests/plugins/dialog/manual/skins/moonolisa.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.12.0
+@bender-tags: 2395, bug, 4.13.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 5aeb6e02694389236bba094c200d795e99fe3135 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 23 Jul 2019 14:36:09 +0200
Subject: [PATCH 61/77] Tests: update version tag.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Krzysztof Krztoń <k.krzton@cksource.com>
---
 tests/plugins/dialog/manual/skins/kama.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/skins/kama.md b/tests/plugins/dialog/manual/skins/kama.md
index 687ceab9d7d..262e3f58b43 100644
--- a/tests/plugins/dialog/manual/skins/kama.md
+++ b/tests/plugins/dialog/manual/skins/kama.md
@@ -1,4 +1,4 @@
-@bender-tags: 2395, bug, 4.12.0
+@bender-tags: 2395, bug, 4.13.0
 @bender-ui: collapsed
 @bender-ckeditor-plugins: wysiwygarea, toolbar, link
 

From 6aeaf8f032bb4af038634d02f3831c816ad391ee Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Tue, 23 Jul 2019 16:25:04 +0200
Subject: [PATCH 62/77] Fix dialog getting out of viewport when resizing
 window.

---
 plugins/dialog/plugin.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 806af69b15f..2023dcb83ec 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -815,15 +815,17 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 					width: Math.max( viewPaneSize.width - dialogSize.width, 0 ),
 					height: Math.max( viewPaneSize.height - dialogSize.height, 0 )
 				};
+
 			if ( this._.position && this._.position.x == x && this._.position.y == y ) {
 				// If position didn't change window might have been resized.
-				x = freeSpace.width * ratios.width;
-				y = freeSpace.height * ratios.height;
+				x = Math.floor( freeSpace.width * ratios.width );
+				y = Math.floor( freeSpace.height * ratios.height );
 			} else {
 				// When no free space don't divide by zero, use previous value.
 				ratios.width = freeSpace.width ? ( x / freeSpace.width ) : ratios.width;
 				ratios.height = freeSpace.height ? ( y / freeSpace.height ) : ratios.height;
 			}
+
 			// Save the current position.
 			this._.position = { x: x, y: y };
 

From f0b9a9b451e985efcc8e786912b6a695b1d902fd Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 14:08:32 +0200
Subject: [PATCH 63/77] Fix dialog not being resizable to the edge of viewport.

---
 plugins/dialog/plugin.js | 44 ++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 2023dcb83ec..19c782b2bec 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -715,6 +715,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	function resizeWithWindow( dialog ) {
 		var win = CKEDITOR.document.getWindow();
 		function resizeHandler() {
+			if ( window.prev ) {
+				return;
+			}
 			dialog.layout();
 		}
 		win.on( 'resize', resizeHandler );
@@ -1187,6 +1190,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			// Create the HTML for the tab and the content block.
 			var page = CKEDITOR.dom.element.createFromHtml( pageHtml.join( '' ) );
 			page.setAttribute( 'role', 'tabpanel' );
+			page.setStyle( 'min-height', '100%' );
 
 			var env = CKEDITOR.env;
 			var tabId = 'cke_' + contents.id + '_' + CKEDITOR.tools.getNextNumber(),
@@ -2041,7 +2045,8 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			startSize = dialog.getSize();
 
 			var content = dialog.parts.contents,
-				iframeDialog = content.$.getElementsByTagName( 'iframe' ).length;
+				iframeDialog = content.$.getElementsByTagName( 'iframe' ).length,
+				isBorderBox = !( CKEDITOR.env.gecko || CKEDITOR.env.ie && CKEDITOR.env.quirks );
 
 			// Shim to help capturing "mousemove" over iframe.
 			if ( iframeDialog ) {
@@ -2049,15 +2054,10 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				content.append( dialogCover );
 			}
 
-			var isBorderBox = !( CKEDITOR.env.gecko || CKEDITOR.env.ie && CKEDITOR.env.quirks ),
-				heightStyle = content.getStyle( 'height' ),
-				widthStyle = content.getStyle( 'width' ),
-				toPx = CKEDITOR.tools.convertToPx;
-
 			// Calculate the offset between content and chrome size.
-			// Use inline style, because of (#3144), fallback to `element.getSize`.
-			wrapperHeight = startSize.height - ( heightStyle ? toPx( heightStyle ) : content.getSize( 'height', isBorderBox ) );
-			wrapperWidth = startSize.width - ( widthStyle ? toPx( widthStyle ) : content.getSize( 'width', 1 ) );
+			// Use size of current tab panel because we can't rely on size of contents container (#3144).
+			wrapperHeight = startSize.height - dialog.parts.contents.getFirst( isVisible ).getSize( 'height', isBorderBox );
+			wrapperWidth = startSize.width - dialog.parts.contents.getFirst( isVisible ).getSize( 'width', 1 );
 
 			origin = { x: $event.screenX, y: $event.screenY };
 
@@ -2073,6 +2073,10 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			}
 
 			$event.preventDefault && $event.preventDefault();
+
+			function isVisible( el ) {
+				return el.isVisible();
+			}
 		} );
 
 		// Prepend the grip to the dialog.
@@ -2134,6 +2138,13 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			dialog.resize( width, height );
 
+			if ( dialog._.moved ) {
+				var x = dialog._.position.x,
+					y = dialog._.position.y;
+
+				updateRatios( dialog, x, y );
+			}
+
 			if ( !dialog._.moved )
 				dialog.layout();
 
@@ -2157,6 +2168,21 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 	}
 
+	function updateRatios( dialog, x, y ) {
+		var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+			dialogSize = dialog.getSize(),
+			ratios = dialog._.viewportRatio,
+			freeSpace = {
+				width: Math.max( viewPaneSize.width - dialogSize.width, 0 ),
+				height: Math.max( viewPaneSize.height - dialogSize.height, 0 )
+			};
+
+		ratios.width = freeSpace.width ? ( x / freeSpace.width ) : ratios.width;
+		ratios.height = freeSpace.height ? ( y / freeSpace.height ) : ratios.height;
+
+		dialog._.viewportRatio = ratios;
+	}
+
 	// Caching reusable covers and allowing only one cover on screen.
 	var covers = {},
 		currentCover;

From 2b0ca133ff2f5429d4c49725438abdd033bfe6ed Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 14:08:51 +0200
Subject: [PATCH 64/77] Refactoring, reuse existing functions/variables.

---
 plugins/dialog/plugin.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 19c782b2bec..0660e28f4ed 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -824,9 +824,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				x = Math.floor( freeSpace.width * ratios.width );
 				y = Math.floor( freeSpace.height * ratios.height );
 			} else {
-				// When no free space don't divide by zero, use previous value.
-				ratios.width = freeSpace.width ? ( x / freeSpace.width ) : ratios.width;
-				ratios.height = freeSpace.height ? ( y / freeSpace.height ) : ratios.height;
+				updateRatios( this, x, y );
 			}
 
 			// Save the current position.
@@ -871,7 +869,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) {
 				element.appendTo( CKEDITOR.document.getBody() );
 			} else {
-				element.setStyle( 'display', CKEDITOR.env.ie && !CKEDITOR.env.edge ? 'block' : 'flex' );
+				element.setStyle( 'display', useFlex ? 'flex' :'block' );
 			}
 
 			// First, set the dialog to an appropriate size.

From c96a2d923ebe94bbf6e8720423f122b4997f75d3 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 14:15:21 +0200
Subject: [PATCH 65/77] Tests: add more information about dialog behaviour when
 window is resized.

---
 tests/plugins/dialog/manual/inputfocus.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/manual/inputfocus.md b/tests/plugins/dialog/manual/inputfocus.md
index ba2a151b67f..3dcbc8391b7 100644
--- a/tests/plugins/dialog/manual/inputfocus.md
+++ b/tests/plugins/dialog/manual/inputfocus.md
@@ -18,4 +18,15 @@
 - Dialog window can be resized and dragged around.
 - When closing and reopening dialog it has same size and position as it had before when it was closed.
 
-Note: When you reposition dialog it won't be centered when resizing browser window.
+### Note
+When you reposition dialog it won't be centered when resizing browser window. Repositioned dialog will move in a way that it will have same percentage of free space on each side. E.g. Consider there is when there is free space around dialog:
+- on the left 10px
+- on the right 90px
+
+Then when window width is increased so that there will be 200px of free space around dialog now there will be:
+- on the left 20px
+- on the right 180px
+
+If instead window width is decreased so there is 50px free space then there will be:
+- on the left 5px
+- on the right 45px

From eb2d6851884c63200b732c4b45310192507507db Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 14:35:06 +0200
Subject: [PATCH 66/77] Replace use of viewport size with container size.
 Reason for that is container is host of scrollbars when dialog doesn't fit.

---
 plugins/dialog/plugin.js | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 0660e28f4ed..74ef528071e 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -764,9 +764,9 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			// Update dialog position when dimension get changed in RTL.
 			if ( this._.editor.lang.dir == 'rtl' && this._.position ) {
-				var viewPaneWidth = CKEDITOR.document.getWindow().getViewPaneSize().width;
+				var containerWidth = getContainerSize( this ).width;
 
-				this._.position.x = viewPaneWidth - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
+				this._.position.x = containerWidth - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
 			}
 
 			this._.contentSize = { width: width, height: height };
@@ -811,12 +811,12 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				element.setStyle( 'zoom', '100%' );
 			}
 
-			var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+			var containerSize = getContainerSize( this ),
 				dialogSize = this.getSize(),
 				ratios = this._.viewportRatio,
 				freeSpace = {
-					width: Math.max( viewPaneSize.width - dialogSize.width, 0 ),
-					height: Math.max( viewPaneSize.height - dialogSize.height, 0 )
+					width: Math.max( containerSize.width - dialogSize.width, 0 ),
+					height: Math.max( containerSize.height - dialogSize.height, 0 )
 				};
 
 			if ( this._.position && this._.position.x == x && this._.position.y == y ) {
@@ -1955,7 +1955,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 		function mouseMoveHandler( evt ) {
 			var dialogSize = dialog.getSize(),
-				viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+				containerSize = getContainerSize( dialog ),
 				x = evt.data.$.screenX,
 				y = evt.data.$.screenY,
 				dx = x - lastCoords.x,
@@ -1968,16 +1968,16 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			if ( abstractDialogCoords.x + margins[ 3 ] < magnetDistance ) {
 				realX = -margins[ 3 ];
-			} else if ( abstractDialogCoords.x - margins[ 1 ] > viewPaneSize.width - dialogSize.width - magnetDistance ) {
-				realX = viewPaneSize.width - dialogSize.width + ( editor.lang.dir == 'rtl' ? 0 : margins[ 1 ] );
+			} else if ( abstractDialogCoords.x - margins[ 1 ] > containerSize.width - dialogSize.width - magnetDistance ) {
+				realX = containerSize.width - dialogSize.width + ( editor.lang.dir == 'rtl' ? 0 : margins[ 1 ] );
 			} else {
 				realX = abstractDialogCoords.x;
 			}
 
 			if ( abstractDialogCoords.y + margins[ 0 ] < magnetDistance ) {
 				realY = -margins[ 0 ];
-			} else if ( abstractDialogCoords.y - margins[ 2 ] > viewPaneSize.height - dialogSize.height - magnetDistance ) {
-				realY = viewPaneSize.height - dialogSize.height + margins[ 2 ];
+			} else if ( abstractDialogCoords.y - margins[ 2 ] > containerSize.height - dialogSize.height - magnetDistance ) {
+				realY = containerSize.height - dialogSize.height + margins[ 2 ];
 			} else {
 				realY = abstractDialogCoords.y;
 			}
@@ -2166,13 +2166,22 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 	}
 
+	function getContainerSize( dialog ) {
+		var container = dialog.parts.dialog.getParent();
+
+		return {
+			width: container.$.clientWidth,
+			height: container.$.clientHeight
+		}
+	}
+
 	function updateRatios( dialog, x, y ) {
-		var viewPaneSize = CKEDITOR.document.getWindow().getViewPaneSize(),
+		var containerSize = getContainerSize( dialog ),
 			dialogSize = dialog.getSize(),
 			ratios = dialog._.viewportRatio,
 			freeSpace = {
-				width: Math.max( viewPaneSize.width - dialogSize.width, 0 ),
-				height: Math.max( viewPaneSize.height - dialogSize.height, 0 )
+				width: Math.max( containerSize.width - dialogSize.width, 0 ),
+				height: Math.max( containerSize.height - dialogSize.height, 0 )
 			};
 
 		ratios.width = freeSpace.width ? ( x / freeSpace.width ) : ratios.width;
@@ -2190,8 +2199,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	}
 
 	function showCover( editor ) {
-		var win = CKEDITOR.document.getWindow(),
-			config = editor.config,
+		var config = editor.config,
 			skinName = ( CKEDITOR.skinName || editor.config.skin ),
 			backgroundColorStyle = config.dialog_backgroundCoverColor || ( skinName == 'moono-lisa' ? 'black' : 'white' ),
 			backgroundCoverOpacity = config.dialog_backgroundCoverOpacity,
@@ -2271,7 +2279,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			return;
 
 		editor.focusManager.remove( currentCover );
-		var win = CKEDITOR.document.getWindow();
 		currentCover.hide();
 	}
 

From 85ed73017a2325b85fef790ac64da2614eeeb4f6 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 15:03:07 +0200
Subject: [PATCH 67/77] Add getClinetsize method.

---
 core/dom/element.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/core/dom/element.js b/core/dom/element.js
index f1975473fcd..97f39d8249f 100644
--- a/core/dom/element.js
+++ b/core/dom/element.js
@@ -682,6 +682,19 @@ CKEDITOR.dom.element.clearMarkers = function( database, element, removeFromDatab
 			return new CKEDITOR.dom.nodeList( this.$.childNodes );
 		},
 
+		/**
+		 * Gets the elements `clientWidth` and `clientHeight`.
+		 *
+		 * @since 4.13.0
+		 * @returns {Object} An object containing width and height values.
+		 */
+		getClientSize: function() {
+			return {
+				width: this.$.clientWidth,
+				height: this.$.clientHeight
+			};
+		},
+
 		/**
 		 * Gets the current computed value of one of the element CSS style
 		 * properties.

From fb829f164bf6ded28be9e05e237d8919d93f3037 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 15:03:59 +0200
Subject: [PATCH 68/77] Use new dom.element.getClientSize instead of local
 helper.

---
 plugins/dialog/plugin.js | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 74ef528071e..599ccbbe293 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -764,7 +764,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			// Update dialog position when dimension get changed in RTL.
 			if ( this._.editor.lang.dir == 'rtl' && this._.position ) {
-				var containerWidth = getContainerSize( this ).width;
+				var containerWidth = dialog.parts.dialog.getParent().getClientSize().width;
 
 				this._.position.x = containerWidth - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
 			}
@@ -811,7 +811,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				element.setStyle( 'zoom', '100%' );
 			}
 
-			var containerSize = getContainerSize( this ),
+			var containerSize = this.parts.dialog.getParent().getClientSize(),
 				dialogSize = this.getSize(),
 				ratios = this._.viewportRatio,
 				freeSpace = {
@@ -1955,7 +1955,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 		function mouseMoveHandler( evt ) {
 			var dialogSize = dialog.getSize(),
-				containerSize = getContainerSize( dialog ),
+				containerSize = dialog.parts.dialog.getParent().getClientSize(),
 				x = evt.data.$.screenX,
 				y = evt.data.$.screenY,
 				dx = x - lastCoords.x,
@@ -2166,17 +2166,8 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 		}
 	}
 
-	function getContainerSize( dialog ) {
-		var container = dialog.parts.dialog.getParent();
-
-		return {
-			width: container.$.clientWidth,
-			height: container.$.clientHeight
-		}
-	}
-
 	function updateRatios( dialog, x, y ) {
-		var containerSize = getContainerSize( dialog ),
+		var containerSize = dialog.parts.dialog.getParent().getClientSize(),
 			dialogSize = dialog.getSize(),
 			ratios = dialog._.viewportRatio,
 			freeSpace = {

From bfaedbd5e53951ee047e0f12986c5cb92ee4ed24 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 15:04:08 +0200
Subject: [PATCH 69/77] Tests: fix tests after chagnes.

---
 tests/plugins/dialog/positioning.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/plugins/dialog/positioning.js b/tests/plugins/dialog/positioning.js
index 6e4b7d6bfce..40da612cac6 100644
--- a/tests/plugins/dialog/positioning.js
+++ b/tests/plugins/dialog/positioning.js
@@ -200,7 +200,8 @@
 		var window = CKEDITOR.document.getWindow(),
 			stubs = {
 				getWindow: sinon.stub( CKEDITOR.document, 'getWindow' ),
-				getViewPane: sinon.stub( window, 'getViewPaneSize' )
+				getViewPane: sinon.stub( window, 'getViewPaneSize' ),
+				getContainerSize: mockDialogContainerSize( viewPaneSize )
 			};
 
 		stubs.getWindow.returns( window );
@@ -208,4 +209,18 @@
 
 		return stubs;
 	}
+
+	function mockDialogContainerSize( sizes ) {
+		var originalMethod = CKEDITOR.dom.element.prototype.getClientSize;
+
+		CKEDITOR.dom.element.prototype.getClientSize = function() {
+			return this.hasClass( 'cke_dialog_container' ) ? sizes :  originalMethod.call( this );
+		};
+
+		return {
+			restore: function() {
+				CKEDITOR.dom.element.prototype.getClientSize = originalMethod;
+			}
+		};
+	}
 } )();

From 89912aad0f72c772ccddf72b7728d7c0d89f7bce Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 24 Jul 2019 15:07:18 +0200
Subject: [PATCH 70/77] Tests: add test case.

---
 tests/core/dom/element/element.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/core/dom/element/element.js b/tests/core/dom/element/element.js
index 91e52fa6b9d..879e2098a37 100644
--- a/tests/core/dom/element/element.js
+++ b/tests/core/dom/element/element.js
@@ -1230,6 +1230,20 @@ bender.test( appendDomObjectTests(
 
 			assert.areSame( String( leftMouseButton ), link.getAttribute( 'data-button' ),
 				'Proper event data was passed' );
+		},
+
+		'test getClientSize': function() {
+			var element = new CKEDITOR.dom.element( 'div' );
+
+			element.$ = {
+				clientWidth: 100,
+				clientHeight: 100
+			};
+
+			var size = element.getClientSize();
+
+			assert.areSame( 100, size.width );
+			assert.areSame( 100, size.height );
 		}
 	}
 ) );

From 59f01db0c35917589c732db5f1c525508178e19f Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 28 Aug 2019 09:23:31 +0200
Subject: [PATCH 71/77] Fix referrence error.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 599ccbbe293..541d07e5339 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -764,7 +764,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 
 			// Update dialog position when dimension get changed in RTL.
 			if ( this._.editor.lang.dir == 'rtl' && this._.position ) {
-				var containerWidth = dialog.parts.dialog.getParent().getClientSize().width;
+				var containerWidth = this.parts.dialog.getParent().getClientSize().width;
 
 				this._.position.x = containerWidth - this._.contentSize.width - parseInt( this._.element.getFirst().getStyle( 'right' ), 10 );
 			}

From 813cf16b1f1f220dc7ca372cfc81c2fd8fc7cb72 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 28 Aug 2019 09:36:56 +0200
Subject: [PATCH 72/77] Code style, missing space.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 541d07e5339..a367136a5cd 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -869,7 +869,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 			if ( !( element.getParent() && element.getParent().equals( CKEDITOR.document.getBody() ) ) ) {
 				element.appendTo( CKEDITOR.document.getBody() );
 			} else {
-				element.setStyle( 'display', useFlex ? 'flex' :'block' );
+				element.setStyle( 'display', useFlex ? 'flex' : 'block' );
 			}
 
 			// First, set the dialog to an appropriate size.

From fca192500a0576b4eac56f1c839cf6cd70a91c40 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 28 Aug 2019 09:44:23 +0200
Subject: [PATCH 73/77] Fix dialog being resizible out of viewport in RTL
 editors.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index a367136a5cd..c58690556fe 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2108,7 +2108,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				internalWidth = width + dx * ( dialog._.moved ? 1 : 2 ),
 				internalHeight = height + dy * ( dialog._.moved ? 1 : 2 ),
 				element = dialog._.element.getFirst(),
-				right = rtl && element.getComputedStyle( 'right' ),
+				right = rtl && CKEDITOR.tools.convertToPx( element.getComputedStyle( 'right' ) ),
 				position = dialog.getPosition();
 
 			position.x = position.x || 0;

From eaff5a82b5d9fa777b2de632c2b75ae3b2f44616 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 28 Aug 2019 09:58:44 +0200
Subject: [PATCH 74/77] Remove leftover.

---
 plugins/dialog/plugin.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index c58690556fe..4022f630078 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -715,9 +715,6 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 	function resizeWithWindow( dialog ) {
 		var win = CKEDITOR.document.getWindow();
 		function resizeHandler() {
-			if ( window.prev ) {
-				return;
-			}
 			dialog.layout();
 		}
 		win.on( 'resize', resizeHandler );

From 8805f182a06a8ae9ce421819daed5f0782d934a6 Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 28 Aug 2019 10:38:46 +0200
Subject: [PATCH 75/77] Add meta tag to test. Add note.

---
 tests/plugins/dialog/manual/inputfocusmobile.html | 5 +++++
 tests/plugins/dialog/manual/inputfocusmobile.md   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/tests/plugins/dialog/manual/inputfocusmobile.html b/tests/plugins/dialog/manual/inputfocusmobile.html
index 5d755114cef..4887cca642d 100644
--- a/tests/plugins/dialog/manual/inputfocusmobile.html
+++ b/tests/plugins/dialog/manual/inputfocusmobile.html
@@ -1,3 +1,7 @@
+<head>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+</head>
+<body>
 <style>
 	.spacer {
 		height: 2000px;
@@ -19,3 +23,4 @@ <h1>Right to left editor:</h1>
 		language: 'he'
 	} );
 </script>
+</body>
diff --git a/tests/plugins/dialog/manual/inputfocusmobile.md b/tests/plugins/dialog/manual/inputfocusmobile.md
index 7dcede2c8c7..7d2f69f2fe0 100644
--- a/tests/plugins/dialog/manual/inputfocusmobile.md
+++ b/tests/plugins/dialog/manual/inputfocusmobile.md
@@ -12,3 +12,6 @@
 ## Unexpected
 
 - Caret is outside of current viewport.
+
+## Note
+When testing with device which has small screen you should hide test steps with `X` button, so editor has enough space.

From 7e45fc6e1fcc21a789064b8b2e90883f5a6e3e5e Mon Sep 17 00:00:00 2001
From: Kajetan Litwinowicz <k.litwinowicz@cksource.com>
Date: Wed, 28 Aug 2019 11:02:10 +0200
Subject: [PATCH 76/77] Don't use convertToPx on value with 'px', parseInt is
 sufficient.

---
 plugins/dialog/plugin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js
index 4022f630078..eee9fe04731 100644
--- a/plugins/dialog/plugin.js
+++ b/plugins/dialog/plugin.js
@@ -2105,7 +2105,7 @@ CKEDITOR.DIALOG_STATE_BUSY = 2;
 				internalWidth = width + dx * ( dialog._.moved ? 1 : 2 ),
 				internalHeight = height + dy * ( dialog._.moved ? 1 : 2 ),
 				element = dialog._.element.getFirst(),
-				right = rtl && CKEDITOR.tools.convertToPx( element.getComputedStyle( 'right' ) ),
+				right = rtl && parseInt( element.getComputedStyle( 'right' ) ),
 				position = dialog.getPosition();
 
 			position.x = position.x || 0;

From 16202c0bfcbf0b263870455989a5d938559389bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Krzton=CC=81?= <k.krzton@cksource.com>
Date: Mon, 9 Sep 2019 19:07:00 +0200
Subject: [PATCH 77/77] Updated changelog entries. [skip ci]

---
 CHANGES.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 093567f8d4c..c0f654cd621 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ New Features:
     * [#3256](/~https://github.com/ckeditor/ckeditor-dev/issues/3256): Triple-clicking in last table cell and deleting content no longer pulls content below into table.
     * [#3118](/~https://github.com/ckeditor/ckeditor-dev/issues/3118): Selecting a paragraph with triple-click and applying heading applies heading only to selected paragraph.
     * [#3161](/~https://github.com/ckeditor/ckeditor-dev/issues/3161): Double click on a `span` element containing one word only creates correct selection including clicked `span` only.
+* [#3359](/~https://github.com/ckeditor/ckeditor-dev/issues/3359): Improved [dialog](https://ckeditor.com/cke4/addon/dialog) positioning and behaviour when browser window is resized, dialog resized or moved.
 
 Fixed Issues:
 
@@ -27,9 +28,10 @@ Fixed Issues:
 * [#3101](/~https://github.com/ckeditor/ckeditor-dev/issues/3101): Fixed: [`CKEDITOR.dom.range#_getTableElement()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-_getTableElement) returns `null` instead of a table element for edge cases.
 * [#3287](/~https://github.com/ckeditor/ckeditor-dev/issues/3287): Fixed: [`CKEDITOR.tools.promise`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_promise.html) incorrectly initialized if an AMD loader is present.
 * [#3379](/~https://github.com/ckeditor/ckeditor-dev/issues/3379): Fixed: Incorrect [`CKEDITOR.editor#getData`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getData) call when inserting content into the editor.
-* [#3136](/~https://github.com/ckeditor/ckeditor-dev/issues/3136) [Firefox] Fixed: Clicking on [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) items removes native table selection.
+* [#3136](/~https://github.com/ckeditor/ckeditor-dev/issues/3136): [Firefox] Fixed: Clicking on [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) items removes native table selection.
 * [#3381](/~https://github.com/ckeditor/ckeditor-dev/issues/3381): [IE8] Fixed: [`CKEDITOR.tools.object.keys`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) does not accept non-objects.
-* [#2395](/~https://github.com/ckeditor/ckeditor-dev/issues/2395): Fixed: focused input in [dialog](https://ckeditor.com/cke4/addon/dialog) is scrolled out of viewport when soft keyboard appears.
+* [#2395](/~https://github.com/ckeditor/ckeditor-dev/issues/2395): [Android] Fixed: Focused input in [dialog](https://ckeditor.com/cke4/addon/dialog) is scrolled out of the viewport when soft keyboard appears.
+* [#453](/~https://github.com/ckeditor/ckeditor-dev/issues/453): Fixed: [Link](https://ckeditor.com/cke4/addon/link) dialog has invalid width when editor is maximized and browser window resized.
 
 API Changes: