Changeset 5623

Timestamp:

06/17/10 11:51:29 (3 years ago)

Author:

garry.yao

Message:

Revert part of [5509] that's harming AIR, also unnecessary for Safari/Chrome.

Location:

CKEditor/branches/features/adobeair/_source

Files:

• plugins/editingblock/plugin.js (modified) (1 diff)
• plugins/sourcearea/plugin.js (modified) (1 diff)
• plugins/wysiwygarea/plugin.js (modified) (1 diff)
• themes/default/theme.js (modified) (1 diff)

CKEditor/branches/features/adobeair/_source/plugins/editingblock/plugin.js

@@ -96 +96 @@
                                         event.removeListener();
 
-                                        // Redirect the focus into editor for webkit. (#5713)
-                                        CKEDITOR.env.webkit && editor.container.on( 'focus', function()
-                                                {
-                                                        editor.focus();
-                                                });
-
                                         if ( editor.config.startupFocus )
                                                 editor.focus();

CKEditor/branches/features/adobeair/_source/plugins/sourcearea/plugin.js

@@ -35 +35 @@
                                                                 {
                                                                         dir : 'ltr',
-                                                                        tabIndex : CKEDITOR.env.webkit ? -1 : editor.tabIndex,
+                                                                        tabIndex : editor.tabIndex,
                                                                         'role' : 'textbox',
                                                                         'aria-label' : editor.lang.editorTitle.replace( '%1', editor.name )

CKEditor/branches/features/adobeair/_source/plugins/wysiwygarea/plugin.js

@@ -321 +321 @@
                                                         // trigger iframe's 'load' event.
                                                         ' src="' + ( CKEDITOR.env.air ? editor._.air_bootstrap_frame_url : CKEDITOR.env.ie ? 'javascript:void(function(){' + encodeURIComponent( srcScript ) + '}())' : '' ) + '"' +
-                                                        '" tabIndex="' + ( CKEDITOR.env.webkit? -1 : editor.tabIndex ) + '"' +
+                                                        ' tabIndex="' + editor.tabIndex + '"' +
                                                         ' allowTransparency="true"' +
                                                         '></iframe>' );

CKEditor/branches/features/adobeair/_source/themes/default/theme.js

@@ -119 +119 @@
                                         ' title="', ( CKEDITOR.env.gecko ? ' ' : '' ), '"' +
                                         ' lang="', editor.langCode, '"' +
-                                        ( CKEDITOR.env.webkit? ' tabindex="' + tabIndex + '"' : '' ) +
                                         ' role="application"' +
                                         ' aria-labelledby="cke_', name, '_arialbl"' +