Changeset 7052 for CKEditor/trunk

Timestamp:

06/15/11 11:04:41 (2 years ago)

Author:

Saare

Message:

#8041: [IE] Some keys were blocked in toolbar by [7036].

Location:

CKEditor/trunk/_source/plugins

Files:

• listblock/plugin.js (modified) (1 diff)
• menu/plugin.js (modified) (1 diff)
• panel/plugin.js (modified) (1 diff)

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

@@ -37 +37 @@
                                         keys[ 38 ]      = 'prev';                                       // ARROW-UP
                                         keys[ CKEDITOR.SHIFT + 9 ]      = 'prev';       // SHIFT + TAB
-                                        keys[ 32 ]      = 'click';                                      // SPACE
+                                        keys[ 32 ]      = CKEDITOR.env.ie ? 'mouseup' : 'click';                                        // SPACE
+                                        CKEDITOR.env.ie && ( keys[ 13 ] = 'mouseup' );          // Manage ENTER, since onclick is blocked in IE (#8041).
 
                                         this._.pendingHtml = [];

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

@@ -300 +300 @@
                                         keys[ 38 ]      = 'prev';                                       // ARROW-UP
                                         keys[ CKEDITOR.SHIFT + 9 ]      = 'prev';       // SHIFT + TAB
-                                        keys[ 32 ]      = 'click';                                      // SPACE
-                                        keys[ ( editor.lang.dir == 'rtl' ? 37 : 39 ) ]  = 'click';  // ARROW-RIGHT/ARROW-LEFT(rtl)
+                                        keys[ ( editor.lang.dir == 'rtl' ? 37 : 39 ) ]= CKEDITOR.env.ie ? 'mouseup' : 'click';  // ARROW-RIGHT/ARROW-LEFT(rtl)
+                                        keys[ 32 ]      = CKEDITOR.env.ie ? 'mouseup' : 'click';                                        // SPACE
+                                        CKEDITOR.env.ie && ( keys[ 13 ] = 'mouseup' );          // Manage ENTER, since onclick is blocked in IE (#8041).
 
                                         element = this._.element = block.element;

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

@@ -381 +381 @@
 
                                 case 'click' :
+                                case 'mouseup' :
                                         index = this._.focusIndex;
                                         link = index >= 0 && this.element.getElementsByTag( 'a' ).getItem( index );
 
                                         if ( link )
-                                                link.$.click ? link.$.click() : link.$.onclick();
+                                                link.$[ keyAction ] ? link.$[ keyAction ]() : link.$[ 'on' + keyAction ]();
 
                                         return false;