vanilla ckeditor-3.5

[ckeditor.git] / _source / plugins / toolbar / plugin.js

diff --git a/_source/plugins/toolbar/plugin.js b/_source/plugins/toolbar/plugin.js
index 029e2dc..4f4cd09 100644 (file)
--- a/_source/plugins/toolbar/plugin.js
+++ b/_source/plugins/toolbar/plugin.js
@@ -43,8 +43,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                {\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
@@ -417,7 +418,7 @@ CKEDITOR.config.toolbar_Basic =
  *     ['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
@@ -436,7 +437,7 @@ CKEDITOR.config.toolbar_Full =
        ['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