Changeset 7036 for CKEditor/trunk

Timestamp:

06/10/11 12:43:32 (2 years ago)

Author:

fredck

Message:

#188 : [IE] Object selection was making the toolbar inactive in some situations.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/button/plugin.js (modified) (1 diff)
• _source/plugins/listblock/plugin.js (modified) (1 diff)
• _source/plugins/menu/plugin.js (modified) (1 diff)
• _source/plugins/richcombo/plugin.js (modified) (1 diff)

CKEditor/trunk/CHANGES.html

@@ -102 +102 @@
                 <li><a href="http://dev.ckeditor.com/ticket/7566">#7566</a> : BiDi: Increasing indentation of a list item changes the language direction.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/7839">#7839</a> : [IE] Pasting multi-level numbered lists from Microsoft Word does not work properly.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/188">#188</a> : [IE] Object selection was making the toolbar inactive in some situations.</li> 
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/7834">#7834</a> : Dutch;</li>

CKEditor/trunk/_source/plugins/button/plugin.js

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

CKEditor/trunk/_source/plugins/listblock/plugin.js

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

CKEditor/trunk/_source/plugins/menu/plugin.js

@@ -479 +479 @@
 //                                      ' 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, '); return false;"' +
+                                        ' onmouseout="CKEDITOR.tools.callFunction(', menu._.itemOutFn, ',', index, ');" ' +
+                                        ( CKEDITOR.env.ie ? 'onclick="return false;" onmouseup' : 'onclick' ) +         // #188
+                                                '="CKEDITOR.tools.callFunction(', menu._.itemClickFn, ',', index, '); return false;"' +
                                         '>' +
                                                 '<span class="cke_icon_wrapper"><span class="cke_icon"' +

CKEditor/trunk/_source/plugins/richcombo/plugin.js

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