Skip to content
Permalink
Browse files

Merge branch 't/9824'

  • Loading branch information...
Reinmar committed Jan 3, 2013
2 parents a728caa + eaa4cdf commit 526aa73ac64868b586e6f8af8ec55b0054a70b4e
@@ -223,7 +223,7 @@ CKEDITOR.event.implementOn( CKEDITOR.command.prototype );
/**
* Fired when the command state changes.
*
* command.on( 'state', function( e ) {
* command.on( 'state', function() {
* // Alerts the new state.
* alert( this.state );
* } );
@@ -447,12 +447,11 @@ CKEDITOR.config.startupMode = 'wysiwyg';
*
* @since 3.5.3
* @event beforeSetMode
* @param {String} newMode The name of the mode which is about to be set.
* @param {String} data The name of the mode which is about to be set.
*/

/**
* Fired after setting the editing mode. See also {@link #beforeSetMode} and {@link #beforeModeUnload}
*
* @event mode
* @param {String} previousMode The previous mode of the editor.
*/
@@ -1065,6 +1065,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;

/**
* Fired when a CKEDITOR instance is created, fully initialized and ready for interaction.
*
* @event instanceReady
* @member CKEDITOR
* @param {CKEDITOR.editor} editor The editor instance that has been created.
@@ -1090,7 +1091,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
*
* @event beforeCommandExec
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} data
* @param data
* @param {String} data.name The command name.
* @param {Object} data.commandData The data to be sent to the command. This
* can be manipulated by the event listener.
@@ -1102,7 +1103,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
*
* @event afterCommandExec
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} data
* @param data
* @param {String} data.name The command name.
* @param {Object} data.commandData The data sent to the command.
* @param {CKEDITOR.command} data.command The command itself.
@@ -1116,7 +1117,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
* Custom configuration files can be loaded thorugh the
* {@link CKEDITOR.config#customConfig} setting. Several files can be loaded
* by changing this setting.
*
* @event customConfigLoaded
* @param {CKEDITOR.editor} editor This editor instance.
*/
@@ -1134,32 +1135,37 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
* in any plugin.
*
* @event destroy
* @param {CKEDITOR.editor} editor This editor instance.
*/

/**
* Internal event to get the current data.
*
* @event beforeGetData
* @param {CKEDITOR.editor} editor This editor instance.
*/

/**
* Internal event to perform the {@link #method-getSnapshot} call.
*
* @event getSnapshot
* @param {CKEDITOR.editor} editor This editor instance.
*/

/**
* Internal event to perform the {@link #method-loadSnapshot} call.
*
* @event loadSnapshot
* @param {CKEDITOR.editor} editor This editor instance.
* @param {String} data The data that will be used.
*/

/**
* Event fired before the {@link #method-getData} call returns allowing additional manipulation.
*
* @event getData
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} data
* @param data
* @param {String} data.dataValue The data that will be returned.
*/

@@ -1168,7 +1174,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
*
* @event setData
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} data
* @param data
* @param {String} data.dataValue The data that will be used.
*/

@@ -1178,7 +1184,7 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
*
* @event afterSetData
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} data
* @param data
* @param {String} data.dataValue The data that has been set.
*/

@@ -1196,14 +1202,15 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
* and ready for interaction.
*
* @event instanceReady
* @param {CKEDITOR.editor} editor This editor instance.
*/

/**
* Internal event to perform the {@link #method-insertHtml} call.
*
* @event insertHtml
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} data
* @param data
* @param {String} data.mode Mode in which data is inserted (see {@link #method-insertHtml}).
* @param {String} data.dataValue The HTML to insert.
*/
@@ -1213,15 +1220,15 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
*
* @event insertText
* @param {CKEDITOR.editor} editor This editor instance.
* @param {String} text The text to insert.
* @param {String} data The text to insert.
*/

/**
* Internal event to perform the {@link #method-insertElement} call.
*
* @event insertElement
* @param {CKEDITOR.editor} editor This editor instance.
* @param {CKEDITOR.dom.element} element The element to insert.
* @param {CKEDITOR.dom.element} data The element to insert.
*/

/**
@@ -1238,8 +1245,9 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
*
* @event template
* @param {CKEDITOR.editor} editor This editor instance.
* @param {String} name The template name.
* @param {String} source The source data for this template.
* @param data
* @param {String} data.name The template name.
* @param {String} data.source The source data for this template.
*/

/**
@@ -1276,11 +1284,13 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
* });
*
* @event contentDom
* @param {CKEDITOR.editor} editor This editor instance.
*/

/**
* Fired before contents DOM structure is destroyed.
* See {@link #contentDom} documentation for more details.
*
* @event contentDomUnload
* @param {CKEDITOR.editor} editor This editor instance.
*/
@@ -149,4 +149,5 @@ CKEDITOR.keystrokeHandler = function( editor ) {
* @param {Number} data.keyCode A number representing the key code (or combination).
* It is the sum of the current key code and the {@link CKEDITOR#CTRL}, {@link CKEDITOR#SHIFT}
* and {@link CKEDITOR#ALT} constants, if those are pressed.
* @param {CKEDITOR.editor} editor This editor instance.
*/
@@ -178,8 +178,12 @@

/**
* @event selectionChange
*
* @member CKEDITOR.editor
* @todo
* @param {CKEDITOR.editor} editor This editor instance.
* @param data
* @param {CKEDITOR.dom.selection} data.selection
* @param {CKEDITOR.dom.elementPath} data.path
*/
editor.define( 'selectionChange', { errorProof:1 } );

@@ -141,7 +141,7 @@ CKEDITOR.event.implementOn( CKEDITOR.ui );
* Internal event fired when a new UI element is ready.
*
* @event ready
* @param {Object} element The new element
* @param {Object} data The new element.
*/

/**
@@ -170,7 +170,8 @@
*
* @event autogrow
* @member CKEDITOR.editor
* @param {Object} data
* @param {CKEDITOR.editor} editor This editor instance.
* @param data
* @param {Number} data.currentHeight The current height of the editor (before resizing).
* @param {Number} data.newHeight The new height of the editor (after resizing). It can be changed
* to determine a different height value to be used instead.
@@ -285,15 +285,16 @@
* @event dirChanged
* @member CKEDITOR.editor
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Object} eventData
* @param {CKEDITOR.dom.node} eventData.node The element that is being changed.
* @param {String} eventData.dir The new direction.
* @param data
* @param {CKEDITOR.dom.node} data.node The element that is being changed.
* @param {String} data.dir The new direction.
*/

/**
* Fired when the language direction in the specific cursor position is changed
*
* @event contentDirChanged
* @member CKEDITOR.editor
* @param {String} eventData The direction in the current position.
* @param {CKEDITOR.editor} editor This editor instance.
* @param {String} data The direction in the current position.
*/
@@ -221,4 +221,5 @@ CKEDITOR.dialog.add( 'paste', function( editor ) {
* @private
* @event pasteDialogCommit
* @member CKEDITOR.editor
* @param {CKEDITOR.editor} editor This editor instance.
*/
@@ -1184,7 +1184,8 @@
* @since 3.1
* @event paste
* @member CKEDITOR.editor
* @param {Object} data
* @param {CKEDITOR.editor} editor This editor instance.
* @param data
* @param {String} data.type Type of data in `data.dataValue`. Usually `html` or `text`, but for listeners
* with priority less than 6 it may be also `auto`, what means that content type hasn't been recognised yet
* (this will be done by content type sniffer that listens with priority 6).
@@ -1197,5 +1198,6 @@
* @private
* @event pasteDialog
* @member CKEDITOR.editor
* @param {Function} [callback] Callback that will be passed to {@link CKEDITOR.editor#openDialog}.
* @param {CKEDITOR.editor} editor This editor instance.
* @param {Function} [data] Callback that will be passed to {@link CKEDITOR.editor#openDialog}.
*/
@@ -3108,24 +3108,27 @@ CKEDITOR.plugins.add( 'dialog', {
*
* @event selectPage
* @member CKEDITOR.dialog
* @param {String} page The id of the page that it's gonna be selected.
* @param {String} currentPage The id of the current page.
* @param data
* @param {String} data.page The id of the page that it's gonna be selected.
* @param {String} data.currentPage The id of the current page.
*/

/**
* Fired when the user tries to dismiss a dialog.
*
* @event cancel
* @member CKEDITOR.dialog
* @param {Boolean} hide Whether the event should proceed or not.
* @param data
* @param {Boolean} data.hide Whether the event should proceed or not.
*/

/**
* Fired when the user tries to confirm a dialog.
*
* @event ok
* @member CKEDITOR.dialog
* @param {Boolean} hide Whether the event should proceed or not.
* @param data
* @param {Boolean} data.hide Whether the event should proceed or not.
*/

/**
@@ -3161,12 +3164,26 @@ CKEDITOR.plugins.add( 'dialog', {
* both the {@link CKEDITOR.dialog} object and the dialog instance
* since 3.5.3, previously it's available only in the global object.
*
* @since 3.5
* @static
* @event resize
* @member CKEDITOR.dialog
* @param {CKEDITOR.dialog} dialog The dialog being resized (if
* @param data
* @param {CKEDITOR.dialog} data.dialog The dialog being resized (if
* it's fired on the dialog itself, this parameter isn't sent).
* @param {String} skin The skin name.
* @param {Number} width The new width.
* @param {Number} height The new height.
* @param {String} data.skin The skin name.
* @param {Number} data.width The new width.
* @param {Number} data.height The new height.
*/

/**
* Fired when a dialog is being resized. The event is fired on
* both the {@link CKEDITOR.dialog} object and the dialog instance
* since 3.5.3, previously it's available only in the global object.
*
* @since 3.5
* @event resize
* @member CKEDITOR.dialog
* @param data
* @param {Number} data.width The new width.
* @param {Number} data.height The new height.
*/
@@ -214,6 +214,7 @@
*
* @event elementsPathUpdate
* @member CKEDITOR.editor
* @param {CKEDITOR.editor} editor This editor instance.
* @param data
* @param {Object} data.space The elementsPath container.
* @param {CKEDITOR.dom.element} data.space The elementsPath container.
*/
@@ -485,6 +485,8 @@ CKEDITOR.plugins.add( 'menu', {
*
* @event menuShow
* @member CKEDITOR.editor
* @param {CKEDITOR.editor} editor This editor instance.
* @param {CKEDITOR.ui.panel[]} data
*/

/**
@@ -369,5 +369,5 @@
*
* @event ariaWidget
* @member CKEDITOR
* @param {Object} holder The element wrapping the panel.
* @param {Object} data The element wrapping the panel.
*/
@@ -167,6 +167,7 @@ CKEDITOR.config.removeFormatAttributes = 'class,style,lang,width,height,align,hs
*
* @event removeFormatCleanup
* @member CKEDITOR.editor
* @param {CKEDITOR.editor} editor This editor instance.
* @param data
* @param {CKEDITOR.dom.element} data.element The element that was cleaned up.
*/

0 comments on commit 526aa73

Please sign in to comment.
You can’t perform that action at this time.