Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.5.3
[ckeditor.git]
/
_source
/
plugins
/
editingblock
/
plugin.js
diff --git
a/_source/plugins/editingblock/plugin.js
b/_source/plugins/editingblock/plugin.js
index
dfbe069
..
05d78b6
100644
(file)
--- a/
_source/plugins/editingblock/plugin.js
+++ b/
_source/plugins/editingblock/plugin.js
@@
-71,7
+71,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
if ( !isHandlingData && editor.mode )
\r
{
\r
isHandlingData = true;
\r
if ( !isHandlingData && editor.mode )
\r
{
\r
isHandlingData = true;
\r
- editor.setData( getMode( editor ).getData() );
\r
+ editor.setData( getMode( editor ).getData(), null, 1 );
\r
isHandlingData = false;
\r
}
\r
});
\r
isHandlingData = false;
\r
}
\r
});
\r
@@
-153,6
+153,8
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
\r
CKEDITOR.editor.prototype.setMode = function( mode )
\r
{
\r
*/
\r
CKEDITOR.editor.prototype.setMode = function( mode )
\r
{
\r
+ this.fire( 'beforeSetMode', { newMode : mode } );
\r
+
\r
var data,
\r
holderElement = this.getThemeSpace( 'contents' ),
\r
isDirty = this.checkDirty();
\r
var data,
\r
holderElement = this.getThemeSpace( 'contents' ),
\r
isDirty = this.checkDirty();
\r
@@
-195,6
+197,7
@@
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
\r
CKEDITOR.editor.prototype.focus = function()
\r
{
\r
*/
\r
CKEDITOR.editor.prototype.focus = function()
\r
{
\r
+ this.forceNextSelectionCheck();
\r
var mode = getMode( this );
\r
if ( mode )
\r
mode.focus();
\r
var mode = getMode( this );
\r
if ( mode )
\r
mode.focus();
\r
@@
-213,6
+216,7
@@
CKEDITOR.config.startupMode = 'wysiwyg';
\r
/**
\r
* Sets whether the editor should have the focus when the page loads.
\r
\r
/**
\r
* Sets whether the editor should have the focus when the page loads.
\r
+ * @name CKEDITOR.config.startupFocus
\r
* @type Boolean
\r
* @default false
\r
* @example
\r
* @type Boolean
\r
* @default false
\r
* @example
\r
@@
-242,7
+246,15
@@
CKEDITOR.config.editingBlock = true;
*/
\r
\r
/**
\r
*/
\r
\r
/**
\r
- * Fired before changing the editing mode
\r
+ * Fired before changing the editing mode.
\r
* @name CKEDITOR.editor#beforeModeUnload
\r
* @event
\r
*/
\r
* @name CKEDITOR.editor#beforeModeUnload
\r
* @event
\r
*/
\r
+
\r
+ /**
\r
+ * Fired before the editor mode is set.
\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