Merge branch 't/12381'

CHANGES.md

@@ -5,6 +5,7 @@ CKEditor 4 Changelog
 
 Fixed Issues:
 
+* [#12381](http://dev.ckeditor.com/ticket/12381): Fixed: Selection trouble in iOS. Thanks to [Remiremi](https://github.com/Remiremi)!
 * [#10804](http://dev.ckeditor.com/ticket/10804): Fixed: `CKEDITOR_GETURL` isn't used with some plugins it should be used. Thanks to [Thomas Andraschko](https://github.com/tandraschko)!
 * [#9137](http://dev.ckeditor.com/ticket/9137): Fixed: `base` tag is not created when `head` has an attribute. Thanks to [naoki.fujikawa](https://github.com/naoki-fujikawa)!
 * [#12377](http://dev.ckeditor.com/ticket/12377): Fixed: Errors thrown in the image plugin when removing preview from dialog definition. Thanks to [Axinet](https://github.com/Axinet)!

plugins/button/plugin.js

@@ -165,8 +165,12 @@
 					editor.unlockSelection( 1 );
 					selLocked = 0;
 				}
-
 				instance.execute();
+
+				// Fixed iOS focus issue when your press disabled button (#12381).
+				if ( env.iOS ) {
+					editor.focus();
+				}
 			} );
 
 

plugins/dialog/plugin.js

@@ -1027,7 +1027,15 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
 				editor.focus();
 
 				// Give a while before unlock, waiting for focus to return to the editable. (#172)
-				setTimeout( function() { editor.focusManager.unlock(); }, 0 );
+				setTimeout( function() {
+					editor.focusManager.unlock();
+
+					// Fixed iOS focus issue (#12381).
+					// Keep in mind that editor.focus() does not work in this case.
+					if ( CKEDITOR.env.iOS ) {
+						editor.window.focus();
+					}
+				}, 0 );
 
 			} else
 				CKEDITOR.dialog._.currentZIndex -= 10;