/*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
For licensing, see LICENSE.html or http://ckeditor.com/license\r
*/\r
\r
{\r
editor.toolbox.focusCommandExecuted = true;\r
\r
- // Make the first button focus accessible. (#3417)\r
- if ( CKEDITOR.env.ie )\r
+ // Make the first button focus accessible for IE. (#3417)\r
+ // Adobe AIR instead need while of delay.\r
+ if ( CKEDITOR.env.ie || CKEDITOR.env.air )\r
setTimeout( function(){ editor.toolbox.focus(); }, 100 );\r
else\r
editor.toolbox.focus();\r
}\r
});\r
\r
+ editor.on( 'destroy', function()\r
+ {\r
+ var toolbars, index = 0, i,\r
+ items, instance;\r
+ toolbars = this.toolbox.toolbars;\r
+ for ( ; index < toolbars.length; index++ )\r
+ {\r
+ items = toolbars[ index ].items;\r
+ for ( i = 0; i < items.length; i++ )\r
+ {\r
+ instance = items[ i ];\r
+ if ( instance.clickFn ) CKEDITOR.tools.removeFunction( instance.clickFn );\r
+ if ( instance.keyDownFn ) CKEDITOR.tools.removeFunction( instance.keyDownFn );\r
+\r
+ if ( instance.index ) CKEDITOR.ui.button._.instances[ instance.index ] = null;\r
+ }\r
+ }\r
+ });\r
+\r
editor.addCommand( 'toolbarFocus', commands.toolbarFocus );\r
}\r
});\r
* ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],\r
* ['BidiLtr', 'BidiRtl' ],\r
* ['Link','Unlink','Anchor'],\r
- * ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],\r
+ * ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],\r
* '/',\r
* ['Styles','Format','Font','FontSize'],\r
* ['TextColor','BGColor'],\r
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],\r
['BidiLtr', 'BidiRtl' ],\r
['Link','Unlink','Anchor'],\r
- ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],\r
+ ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],\r
'/',\r
['Styles','Format','Font','FontSize'],\r
['TextColor','BGColor'],\r