Ticket #8007: 8007.patch

_source/plugins/richcombo/plugin.js

@@ -199 +199 @@
 
                         output.push(
                                         ' onkeydown="CKEDITOR.tools.callFunction( ', keyDownFn, ', event, this );"' +
-                                        ' onfocus="return CKEDITOR.tools.callFunction(', focusFn, ', event);" ' +
-                                        ( CKEDITOR.env.ie ? 'onmouseup' : 'onclick' ) +         // #188
-                                                '="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
+                                        ' onfocus="return CKEDITOR.tools.callFunction(', focusFn, ', event);"' +
+                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
                                                 '<span>' +
                                                         '<span id="' + id + '_text" class="cke_text cke_inline_label">' + this.label + '</span>' +
                                                 '</span>' +

_source/plugins/menu/plugin.js

@@ -475 +475 @@
                                 output.push(
 //                                      ' onkeydown="return CKEDITOR.ui.button._.keydown(', index, ', event);"' +
                                         ' onmouseover="CKEDITOR.tools.callFunction(', menu._.itemOverFn, ',', index, ');"' +
-                                        ' onmouseout="CKEDITOR.tools.callFunction(', menu._.itemOutFn, ',', index, ');" ' +
-                                        ( CKEDITOR.env.ie ? 'onmouseup' : 'onclick' ) +         // #188
-                                                '="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, '); return false;"' +
+                                        ' onmouseout="CKEDITOR.tools.callFunction(', menu._.itemOutFn, ',', index, ');"' +
+                                        ' onclick="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, '); return false;"' +
                                         '>' +
                                                 '<span class="cke_icon_wrapper"><span class="cke_icon"' +
                                                         ( this.icon ? ' style="background-image:url(' + CKEDITOR.getUrl( this.icon ) + ');background-position:0 ' + offset + 'px;"'

_source/core/dom/element.js

@@ -1245 +1245 @@
                                         this.on( 'dragstart', function( evt ) { evt.data.preventDefault(); } );
                                 }
                         :
+                                // IE and Opera
                                 function()
                                 {
-                                        if ( CKEDITOR.env.ie || CKEDITOR.env.opera )
-                                        {
-                                                var element = this.$,
-                                                        e,
-                                                        i = 0;
-
-                                                element.unselectable = 'on';
-
-                                                while ( ( e = element.all[ i++ ] ) )
-                                                {
-                                                        switch ( e.tagName.toLowerCase() )
-                                                        {
-                                                                case 'iframe' :
-                                                                case 'textarea' :
-                                                                case 'input' :
-                                                                case 'select' :
-                                                                        /* Ignore the above tags */
-                                                                        break;
-                                                                default :
-                                                                        e.unselectable = 'on';
-                                                        }
-                                                }
-                                        }
+                                        this.$.unselectable = 'on';
                                 },
 
                 getPositionedAncestor : function()

_source/themes/default/theme.js

@@ -155 +155 @@
                                         '</span>' +
                                 '</span>' ].join( '' ) );
 
-                        container.getChild( [1, 0, 0, 0, 0] ).unselectable();
-                        container.getChild( [1, 0, 0, 0, 2] ).unselectable();
+                        // Make the theme spaces unelectable, avoid taking way focus when clicked.
+                        container.getChild( [1, 0, 0, 0, 0, 0] ).unselectable();
+                        container.getChild( [1, 0, 0, 0, 2, 0 ] ).unselectable();
+                        container.on( 'mousedown', function( evt )
+                        {
+                                var target = evt.data.getTarget();
+                                !target.hasAscendant( 'a', 1 ) && evt.data.preventDefault();
+                        });
 
                         if ( elementMode == CKEDITOR.ELEMENT_MODE_REPLACE )
                                 container.insertAfter( element );

_source/plugins/button/plugin.js

@@ -210 +210 @@
 
                 output.push(
                                         ' onkeydown="return CKEDITOR.tools.callFunction(', keydownFn, ', event);"' +
-                                        ' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', event);" ' +
-                                        ( CKEDITOR.env.ie ? 'onmouseup' : 'onclick' ) +         // #188
-                                                '="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
+                                        ' onfocus="return CKEDITOR.tools.callFunction(', focusFn,', event);"' +
+                                ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
                                         '<span class="cke_icon"' );
 
                 if ( this.icon )

_source/plugins/listblock/plugin.js

@@ -96 +96 @@
                                                         '<li id=', id, ' class=cke_panel_listItem role=presentation>' +
                                                                 '<a id="', id, '_option" _cke_focus=1 hidefocus=true' +
                                                                         ' title="', title || value, '"' +
-                                                                        ' href="javascript:void(\'', value, '\')" ' +
-                                                                        ( CKEDITOR.env.ie ? 'onmouseup' : 'onclick' ) +         // #188
-                                                                                '="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',
+                                                                        ' href="javascript:void(\'', value, '\')"' +
+                                                                        ' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;"',
                                                                         ' role="option"' +
                                                                         ' aria-posinset="' + ++this._.size + '">',
                                                                         html || value,

_source/plugins/toolbar/plugin.js

@@ -172 +172 @@
 
                                                 var labelId = CKEDITOR.tools.getNextId();
 
-                                                var output = [ '<div class="cke_toolbox" role="group" aria-labelledby="', labelId, '" onmousedown="return false;"' ],
+                                                var output = [ '<div class="cke_toolbox" role="group" aria-labelledby="', labelId, '"' ],
                                                         expanded =  editor.config.toolbarStartupExpanded !== false,
                                                         groupStarted;