vanilla ckeditor-3.6.3

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

diff --git a/_source/plugins/editingblock/plugin.js b/_source/plugins/editingblock/plugin.js
index 05d78b6..abe0b71 100644 (file)
--- a/_source/plugins/editingblock/plugin.js
+++ b/_source/plugins/editingblock/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -10,11 +10,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
 (function()\r
 {\r
-       var getMode = function( editor, mode )\r
-       {\r
-               return editor._.modes && editor._.modes[ mode || editor.mode ];\r
-       };\r
-\r
        // This is a semaphore used to avoid recursive calls between\r
        // the following data handling functions.\r
        var isHandlingData;\r
@@ -49,7 +44,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                function setData()\r
                                                {\r
                                                        isHandlingData = true;\r
-                                                       getMode( editor ).loadData( editor.getData() );\r
+                                                       editor.getMode().loadData( editor.getData() );\r
                                                        isHandlingData = false;\r
                                                }\r
 \r
@@ -59,8 +54,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                {\r
                                                        editor.on( 'mode', function()\r
                                                                {\r
-                                                                       setData();\r
-                                                                       editor.removeListener( 'mode', arguments.callee );\r
+                                                                       if ( editor.mode )\r
+                                                                       {\r
+                                                                               setData();\r
+                                                                               editor.removeListener( 'mode', arguments.callee );\r
+                                                                       }\r
                                                                });\r
                                                }\r
                                        }\r
@@ -71,7 +69,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                        if ( !isHandlingData && editor.mode )\r
                                        {\r
                                                isHandlingData = true;\r
-                                               editor.setData( getMode( editor ).getData(), null, 1 );\r
+                                               editor.setData( editor.getMode().getData(), null, 1 );\r
                                                isHandlingData = false;\r
                                        }\r
                                });\r
@@ -79,13 +77,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        editor.on( 'getSnapshot', function( event )\r
                                {\r
                                        if ( editor.mode )\r
-                                               event.data = getMode( editor ).getSnapshotData();\r
+                                               event.data = editor.getMode().getSnapshotData();\r
                                });\r
 \r
                        editor.on( 'loadSnapshot', function( event )\r
                                {\r
                                        if ( editor.mode )\r
-                                               getMode( editor ).loadSnapshotData( event.data );\r
+                                               editor.getMode().loadSnapshotData( event.data );\r
                                });\r
 \r
                        // For the first "mode" call, we'll also fire the "instanceReady"\r
@@ -165,9 +163,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                        if ( mode == this.mode )\r
                                return;\r
 \r
+                       this._.previousMode = this.mode;\r
+\r
                        this.fire( 'beforeModeUnload' );\r
 \r
-                       var currentMode = getMode( this );\r
+                       var currentMode = this.getMode();\r
                        data = currentMode.getData();\r
                        currentMode.unload( holderElement );\r
                        this.mode = '';\r
@@ -176,7 +176,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                holderElement.setHtml( '' );\r
 \r
                // Load required mode.\r
-               var modeEditor = getMode( this, mode );\r
+               var modeEditor = this.getMode( mode );\r
                if ( !modeEditor )\r
                        throw '[CKEDITOR.editor.setMode] Unknown mode "' + mode + '".';\r
 \r
@@ -189,7 +189,18 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                });\r
                }\r
 \r
-               modeEditor.load( holderElement, ( typeof data ) != 'string'  ? this.getData() : data);\r
+               modeEditor.load( holderElement, ( typeof data ) != 'string'  ? this.getData() : data );\r
+       };\r
+\r
+       /**\r
+        * Gets the current or any of the objects that represent the editing\r
+        * area modes. The two most common editing modes are "wysiwyg" and "source".\r
+        * @param {String} [mode] The mode to be retrieved. If not specified, the\r
+        *              current one is returned.\r
+        */\r
+       CKEDITOR.editor.prototype.getMode = function( mode )\r
+       {\r
+               return this._.modes && this._.modes[ mode || this.mode ];\r
        };\r
 \r
        /**\r
@@ -198,7 +209,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        CKEDITOR.editor.prototype.focus = function()\r
        {\r
                this.forceNextSelectionCheck();\r
-               var mode = getMode( this );\r
+               var mode = this.getMode();\r
                if ( mode )\r
                        mode.focus();\r
        };\r
@@ -246,15 +257,22 @@ CKEDITOR.config.editingBlock = true;
  */\r
 \r
 /**\r
- * Fired before changing the editing mode.\r
+ * Fired before changing the editing mode. See also CKEDITOR.editor#beforeSetMode and CKEDITOR.editor#mode\r
  * @name CKEDITOR.editor#beforeModeUnload\r
  * @event\r
  */\r
 \r
  /**\r
- * Fired before the editor mode is set.\r
+ * Fired before the editor mode is set. See also CKEDITOR.editor#mode and CKEDITOR.editor#beforeModeUnload\r
  * @name CKEDITOR.editor#beforeSetMode\r
  * @event\r
  * @since 3.5.3\r
  * @param {String} newMode The name of the mode which is about to be set.\r
  */\r
+\r
+/**\r
+ * Fired after setting the editing mode. See also CKEDITOR.editor#beforeSetMode and CKEDITOR.editor#beforeModeUnload\r
+ * @name CKEDITOR.editor#mode\r
+ * @event\r
+ * @param {String} previousMode The previous mode of the editor.\r
+ */\r