Ticket #10714: 10714.patch

plugins/floatpanel/plugin.js

@@ -80 +80 @@
 
                         editor.on( 'mode', hide );
                         editor.on( 'resize', hide );
+
                         // Window resize doesn't cause hide on blur. (#9800)
+                        // [iOS] Poping up keyboard triggers window resize
+                        // which leads to undesired panel hides
+                        if ( !CKEDITOR.env.iOS )
                         doc.getWindow().on( 'resize', hide );
 
                         // We need a wrapper because events implementation doesn't allow to attach
@@ -145 +149 @@
                                 // Record from where the focus is when open panel.
                                 var editable = this._.editor.editable();
                                 this._.returnFocus = editable.hasFocus ? editable : new CKEDITOR.dom.element( CKEDITOR.document.$.activeElement );
+                                this._.hideTimeout = 0;
 
                                 var element = this.element,
                                         iframe = this._.iframe,
@@ -203 +208 @@
                                                 if ( !this.allowBlur() || ev.data.getPhase() != CKEDITOR.EVENT_PHASE_AT_TARGET )
                                                         return;
 
-                                                if ( this.visible && !this._.activeChild ) {
+                                                if ( this.visible && !this._.activeChild && !this._.hideTimeout ) {
+                                                        // [iOS] Allow hide to be prevented if touch is bound 
+                                                        // to any parent of the iframe blur happens before touch
+                                                        this._.hideTimeout = CKEDITOR.tools.setTimeout( function() {
                                                         // Panel close is caused by user's navigating away the focus, e.g. click outside the panel.
                                                         // DO NOT restore focus in this case.
                                                         delete this._.returnFocus;
                                                         this.hide();
+                                                        }, 0, this );
                                                 }
                                         }, this );
 
@@ -217 +226 @@
                                                 this.allowBlur( true );
                                         }, this );
 
+                                        // [iOS] if touch is bound to any parent of the iframe blur
+                                        // happens twice before touchstart and before touchend
+                                        if ( CKEDITOR.env.iOS ) {
+                                                // Prevent false hiding on blur
+                                                // We don't need to return focus here cuz touchend will fire anyway
+                                                // If user scrolls and pointer gets out of the panel area touchend will also fire
+                                                focused.on( 'touchstart', function() {
+                                                        clearInterval( this._.hideTimeout );
+                                            }, this);
+
+                                                // Set focus back to handle blur and hide panel when needed
+                                                focused.on( 'touchend', function() {
+                                                        this._.hideTimeout = 0;
+                                                        this.focus();
+                                                }, this);
+                                        }
+
                                         CKEDITOR.event.useCapture = false;
 
                                         this._.blurSet = 1;

plugins/wysiwygarea/plugin.js

@@ -264 +264 @@
                         } );
                 }
 
+                if ( CKEDITOR.env.iOS ) {
+                        // [iOS] If touch is bound to any parent of the iframe blur happens on any touch
+                        // event and body becomes the focused element
+                        this.attachListener( doc, 'touchend', function() {
+                                win.focus();
+                        } );
+                }
+
                 // ## END