Ticket #3114: 3114.patch

_source/plugins/menu/plugin.js

@@ -293 +293 @@
 //                                      ' onkeydown="return CKEDITOR.ui.button._.keydown(', index, ', event);"' +
                                         ' onmouseover="CKEDITOR.tools.callFunction(', menu._.itemOverFn, ',', index, ');"' +
                                         ' onmouseout="CKEDITOR.tools.callFunction(', menu._.itemOutFn, ',', index, ');"' +
-                                        ' onclick="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, ');"' +
+                                        ' onclick="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, '); return false;"' +
                                         '>' +
                                                 '<span class="cke_icon"' +
                                                         ( this.icon ? ' style="background-image:url(' + CKEDITOR.getUrl( this.icon ) + ');background-position:0 ' + offset + 'px;"'
-                                                          : '' ) +
+                                                        : '' ) +
                                                         '></span>' +
                                                 '<span class="cke_label">' );
 
@@ -309 +309 @@
 
                         output.push(
                                                         this.label,
-                                                 '</span>' +
+                                                '</span>' +
                                 '</a>' +
                                 '</span>' );
                 }

_source/plugins/listblock/plugin.js

@@ -90 +90 @@
                                                                 '<a _cke_focus=1 hidefocus=true' +
                                                                         ' title="', title || value, '"' +
                                                                         ' href="javascript:void(\'', value, '\')"' +
-                                                                        ' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\');">',
+                                                                        ' onclick="CKEDITOR.tools.callFunction(', this._.getClick(), ',\'', value, '\'); return false;">',
                                                                         html || value,
                                                                 '</a>' +
                                                         '</li>' );

_source/plugins/richcombo/plugin.js

@@ -185 +185 @@
 
                         output.push(
                                         ' onkeydown="CKEDITOR.tools.callFunction( ', keyDownFn, ', event, this );"' +
-                                        ' onmousedown="CKEDITOR.tools.callFunction(', clickFn, ', this);">' +
+                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
                                                 '<span id="', id, '_text" class=cke_text>&nbsp;</span>' +
                                                 '<span class=cke_openbutton></span>' +
                                         '</a>' +

_source/plugins/colorbutton/plugin.js

@@ -102 +102 @@
                         output.push(
                                 '<a class="cke_colorauto" _cke_focus=1 hidefocus=true' +
                                         ' title="', lang.auto, '"' +
-                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',null,\'', type, '\');"' +
+                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',null,\'', type, '\');return false;"' +
                                         ' href="javascript:void(\'', lang.auto, '\')">' +
                                         '<table cellspacing=0 cellpadding=0 width="100%">' +
                                                 '<tr>' +
@@ -128 +128 @@
                                         '<td>' +
                                                 '<a class="cke_colorbox" _cke_focus=1 hidefocus=true' +
                                                         ' title="', color, '"' +
-                                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'#', color, '\',\'', type, '\');"' +
+                                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'#', color, '\',\'', type, '\'); return false;"' +
                                                         ' href="javascript:void(\'', color, '\')">' +
                                                         '<span class="cke_colorbox" style="background-color:#', color, '"></span>' +
                                                 '</a>' +
@@ -144 +144 @@
                                                 '<td colspan=8 align=center>' +
                                                         '<a class="cke_colormore" _cke_focus=1 hidefocus=true' +
                                                                 ' title="', lang.more, '"' +
-                                                                ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'?\',\'', type, '\');"' +
+                                                                ' onclick="CKEDITOR.tools.callFunction(', clickFn, ',\'?\',\'', type, '\');return false;"' +
                                                                 ' href="javascript:void(\'', lang.more, '\')">',
                                                                 lang.more,
                                                         '</a>' +

_source/plugins/panelbutton/plugin.js

@@ -156 +156 @@
 
                         output.push(
                                         ' onkeydown="CKEDITOR.tools.callFunction( ', keyDownFn, ', event, this );"' +
-                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this);">' +
+                                        ' onclick="CKEDITOR.tools.callFunction(', clickFn, ', this); return false;">' +
                                                 '<span class="cke_icon"></span>' +
                                                 '<span class="cke_label">', this.label, '</span>' +
                                                 '<span class="cke_buttonarrow"></span>' +