vanilla ckeditor-3.5

[ckeditor.git] / _source / core / editor.js

diff --git a/_source/core/editor.js b/_source/core/editor.js
index a8921db..b124703 100644 (file)
--- a/_source/core/editor.js
+++ b/_source/core/editor.js
@@ -227,6 +227,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        plugins = plugins.replace( removeRegex, '' );\r
                }\r
 \r
+               // Load the Adobe AIR plugin conditionally.\r
+               CKEDITOR.env.air && ( plugins += ',adobeair' );\r
+\r
                // Load all plugins defined in the "plugins" setting.\r
                CKEDITOR.plugins.load( plugins.split( ',' ), function( plugins )\r
                        {\r
@@ -756,6 +759,22 @@ CKEDITOR.tools.extend( CKEDITOR.editor.prototype,
                },\r
 \r
                /**\r
+                * Insert text content into the currently selected position in the\r
+                * editor, in WYSIWYG mode, styles of the selected element will be applied to the inserted text,\r
+                * spaces around the text will be leaving untouched.\r
+                * <strong>Note:</strong> two subsequent line-breaks will introduce one paragraph, which element depends on {@link CKEDITOR.config.enterMode};\r
+                * A single line-break will be instead translated into one &lt;br /&gt;.\r
+                * @since 3.5\r
+                * @param {String} text Text to be inserted into the editor.\r
+                * @example\r
+                * CKEDITOR.instances.editor1.<b>insertText( ' line1 \n\n line2' )</b>;\r
+                */\r
+               insertText : function( text )\r
+               {\r
+                       this.fire( 'insertText', text );\r
+               },\r
+\r
+               /**\r
                 * Inserts an element into the currently selected position in the\r
                 * editor.\r
                 * @param {CKEDITOR.dom.element} element The element to be inserted\r