Index: /CKEditor/branches/prototype/_dev/packager/fckpackager.php =================================================================== --- /CKEditor/branches/prototype/_dev/packager/fckpackager.php (revision 2277) +++ /CKEditor/branches/prototype/_dev/packager/fckpackager.php (revision 2278) @@ -356,5 +356,5 @@ // "}" or ")". $script = preg_replace( - '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s', + '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;:]))/s', '};', $script ) ; Index: /CKEditor/branches/prototype/_docs/api/files.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/files.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/files.html (revision 2278) @@ -193,4 +193,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -240,4 +242,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -260,4 +268,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -353,4 +365,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -478,4 +502,26 @@
    +

    core/commandDefinition.js

    + + +
    + Version: + 3.0 +
    + +
    + + +Defines the "virtual" CKEDITOR.commandDefinition class, + which contains the defintion of a command. +
    + + + +
    +
    +
    + +

    core/config.js

    @@ -962,4 +1008,24 @@
    +

    ../../_source/core/\ui.js

    + + +
    + Version: + 3.0 +
    + +
    + + +
    + + + +
    +
    +
    + +

    core/xml.js

    @@ -985,4 +1051,24 @@

    ../../_source/plugins/\basicstyles\plugin.js

    + + +
    + Version: + 3.0 +
    + +
    + + +
    + + + +
    +
    +
    + +
    +

    ../../_source/plugins/\button\plugin.js

    Index: /CKEditor/branches/prototype/_docs/api/index.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/index.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/index.html (revision 2278) @@ -193,4 +193,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -240,4 +242,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -260,4 +268,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -353,4 +365,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -391,4 +415,6 @@ + +

    CKEDITOR.config

    @@ -513,4 +539,10 @@ + + + + + +

    Class Index

    @@ -523,4 +555,12 @@ +
    +

    CKEDITOR.commandDefinition

    + +
    +
    + + + @@ -640,4 +680,28 @@ + + + +
    +

    CKEDITOR.ui

    + +
    +
    + + + +
    +

    CKEDITOR.ui.button

    + +
    +
    + + + +
    +

    CKEDITOR.ui.handlerDefinition

    + +
    +
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ajax.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ajax.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ajax.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.commandDefinition.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.commandDefinition.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.commandDefinition.html (revision 2278) @@ -0,0 +1,596 @@ + + + + + + + JsDoc Reference - CKEDITOR.commandDefinition + + + + + + + + + + + + +
    + + +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Class CKEDITOR.commandDefinition +

    + + +

    + + + + + +
    Defined in: core/commandDefinition.js. + +

    + + + + + + + + + + + + + + + + + +
    Class Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.commandDefinition() +
    +
    (Virtual Class) Do not call this constructor.
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Method Summary
    Method AttributesMethod Name and Description
      +
    exec(editor, data) +
    +
    Executes the command.
    +
    + + + + + + + +
    +
    + Class Detail +
    + +
    + CKEDITOR.commandDefinition() +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + (Virtual Class) Do not call this constructor. This class is not really part + of the API. It just illustrates the features of command objects to be + passed to the CKEDITOR.editor.prototype.addCommand function. + +
    + + + + + + + + + + + + + + + +
    + + + + + + + +
    + Method Detail +
    + + +
    + + {Undefined} + exec(editor, data) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Executes the command. + + +
    + + + + + 
    editorInstance.addCommand( 'sample',
+{
+    exec : function( editor )
+    {
+        alert( 'Executing a command for the editor name "' + editor.name + '"!' );
+    }
+});
    + + + + + +
    +
    Parameters:
    + +
    + {CKEDITOR.editor} editor + +
    +
    The editor within which run the command.
    + +
    + {Object} data + Optional +
    +
    Additional data to be used to execute the command.
    + +
    + + + + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.config.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.config.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.config.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -601,4 +625,14 @@
    + CKEDITOR.config.toolbar +
    +
    The toolbox (alias toolbar) definition.
    + + + + + <static>   + +
    CKEDITOR.config.toolbarLocation
    @@ -1415,4 +1449,49 @@
    + +
    <static> + + {Array} + CKEDITOR.config.toolbar + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + The toolbox (alias toolbar) definition. It is an array of toolbars (strips), +each one being also an array, containing a list of UI items. + +
    + Defined in: plugins/toolbar/plugin.js. + + +
    + + + + + 
    // Defines a toolbar with only one strip containing the "Source" button, a
+// separator and the "Bold" and "Italic" buttons.
+CKEDITOR.config.toolbar =
+[
+    [ 'Source', '-', 'Bold', 'Italic' ]
+];
    + + + + + + + + +
    +
    <static> Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.document.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.document.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.document.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.domObject.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.domObject.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.domObject.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -688,4 +712,13 @@ + +   + +
    unselectable() +
    +
    Makes the element unselectable.
    + + + @@ -2161,4 +2194,45 @@ +
    + + +
    + + {Undefined} + unselectable() + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Makes the element unselectable. + + +
    + + + + + 
    var element = CKEDITOR.dom.element.getById( 'myElement' );
+element.unselectable();
    + + + + + + + + + + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.event.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.event.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.event.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.node.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.node.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.node.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.selection.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.selection.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.selection.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.text.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.text.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.text.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.window.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.window.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.window.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -467,4 +491,14 @@ + +   + +
    + ui +
    +
    Namespace containing UI features related to this editor instance.
    + + + @@ -497,5 +531,5 @@
    addCommand(commandName, commandDefinition)
    -
    NO DOCUMENTATION AVAILABLE
    +
    Adds a command definition to the editor instance.
    @@ -515,5 +549,5 @@
    execCommand(commandName, data)
    -
    NO DOCUMENTATION AVAILABLE
    +
    Executes a command.
    @@ -525,13 +559,4 @@
    Moves the selection focus to the editing are space in the editor.
    - - - - -   - -
    getCommand(commandName) -
    -
    NO DOCUMENTATION AVAILABLE
    @@ -813,19 +838,11 @@ - - - - - - -
    - Method Detail -
    - - +
    + +
    - {Undefined} - addCommand(commandName, commandDefinition) + {CKEDITOR.ui} + ui
    @@ -839,50 +856,35 @@
    -
    - NO DOCUMENTATION AVAILABLE - - -
    - - - - - 
    NO EXAMPLE AVAILABLE
    - - - - - -
    -
    Parameters:
    - -
    - commandName - -
    -
    - -
    - commandDefinition - -
    -
    - -
    - - - - - - - -
    - - + Namespace containing UI features related to this editor instance. + + +
    + + + + + + + + + + + + + + + + + +
    + Method Detail +
    + +
    {Undefined} - addMode(mode, modeEditor) + addCommand(commandName, commandDefinition)
    @@ -898,14 +900,20 @@
    - Registers an editing mode. This function is to be used mainly by plugins. - -
    - Defined in: plugins/editingblock/plugin.js. - - -
    - - - + Adds a command definition to the editor instance. Commands added with +this function can be later executed with #execCommand. + + +
    + + + + + 
    editorInstance.addCommand( 'sample',
+{
+    exec : function( editor )
+    {
+        alert( 'Executing a command for the editor name "' + editor.name + '"!' );
+    }
+});
    @@ -917,14 +925,14 @@
    - {String} mode + {String} commandName
    -
    The mode name.
    +
    The indentifier name of the command.
    - {Object} modeEditor + {CKEDITOR.commandDefinition} commandDefinition
    -
    The mode editor definition.
    +
    The command definition.
    @@ -938,9 +946,9 @@
    - +
    {Undefined} - execCommand(commandName, data) + addMode(mode, modeEditor)
    @@ -956,13 +964,14 @@
    - NO DOCUMENTATION AVAILABLE - - -
    - - - - - 
    NO EXAMPLE AVAILABLE
    + Registers an editing mode. This function is to be used mainly by plugins. + +
    + Defined in: plugins/editingblock/plugin.js. + + +
    + + + @@ -974,14 +983,14 @@
    - commandName + {String} mode
    -
    +
    The mode name.
    - data + {Object} modeEditor
    -
    +
    The mode editor definition.
    @@ -995,9 +1004,9 @@
    - +
    {Undefined} - focus() + execCommand(commandName, data)
    @@ -1013,20 +1022,34 @@
    - Moves the selection focus to the editing are space in the editor. - -
    - Defined in: plugins/editingblock/plugin.js. - - -
    - - - - - 
    NO EXAMPLE AVAILABLE
    - - - - + Executes a command. + + +
    + + + + + 
    editorInstance.execCommand( 'Bold' );
    + + + + + +
    +
    Parameters:
    + +
    + {String} commandName + +
    +
    The indentifier name of the command.
    + +
    + {Object} data + Optional +
    +
    Data to be passed to the command
    + +
    @@ -1038,9 +1061,9 @@
    - +
    {Undefined} - getCommand(commandName) + focus()
    @@ -1056,5 +1079,8 @@
    - NO DOCUMENTATION AVAILABLE + Moves the selection focus to the editing are space in the editor. + +
    + Defined in: plugins/editingblock/plugin.js. @@ -1069,15 +1095,4 @@ - -
    -
    Parameters:
    - -
    - commandName - -
    -
    - -
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -457,4 +481,14 @@ + <static> <constant>   + +
    + CKEDITOR.UI_BUTTON +
    +
    Button UI element.
    + + + + <static>   @@ -760,4 +794,41 @@ 
    if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT )
     alert( 'Text is selected' );
    + + + + + + + + +
    + + +
    <static> <constant> + + {Undefined} + CKEDITOR.UI_BUTTON + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Button UI element. + +
    + Defined in: plugins/button/plugin.js. + + +
    + + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.lang.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.lang.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.lang.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.pluginDefinition.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.pluginDefinition.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.pluginDefinition.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -404,5 +428,5 @@ CKEDITOR.pluginDefinition()
    -
    This class is not really part of the API.
    +
    (Virtual Class) Do not call this constructor.
    @@ -431,4 +455,14 @@   +
    beforeInit(editor, pluginPath) +
    +
    Function called on initialization of every editor instance created in the +page before the init() call task.
    + + + + +   +
    init(editor, pluginPath)
    @@ -465,6 +499,7 @@
    - This class is not really part of the API. It just illustrates the features - of plugin objects to passed to the CKEDITOR.plugins.add function. + (Virtual Class) Do not call this constructor. This class is not really part + of the API. It just illustrates the features of plugin objects to be + passed to the CKEDITOR.plugins.add function.
    @@ -472,7 +507,4 @@ - - 
    // Do not do this.
-var myEvent = new CKEDITOR.pluginDefinition();  // Error: CKEDITOR.pluginDefinition is undefined
    @@ -498,4 +530,71 @@ Method Detail + + +
    + + {Undefined} + beforeInit(editor, pluginPath) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Function called on initialization of every editor instance created in the +page before the init() call task. The beforeInit function will be called for +all plugins, after that the init function is called for all of them. This +feature makes it possible to initialize things that could be used in the +init function of other plugins. + + +
    + + + + + 
    CKEDITOR.plugins.add( 'sample',
+{
+    beforeInit : function( editor, pluginPath )
+    {
+        alert( 'Editor "' + editor.name + '" is to be initialized!' );
+    }
+});
    + + + + + +
    +
    Parameters:
    + +
    + {CKEDITOR.editor} editor + +
    +
    The editor instance being initialized.
    + +
    + {String} pluginPath + +
    +
    The URL path for the plugin installation folder.
    + +
    + + + + + + + +
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • @@ -418,4 +442,28 @@ + + + + + + + + + + + + + + + + +
    Field Summary
    Field AttributesField Name and Description
    <static>   +
    + CKEDITOR.plugins.sourcearea +
    +
    Holds the definition of commands an UI elements included with the sourcearea +plugin.
    +
    + @@ -481,4 +529,47 @@ +
    + Field Detail +
    + + +
    <static> + + {Undefined} + CKEDITOR.plugins.sourcearea + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Holds the definition of commands an UI elements included with the sourcearea +plugin. + +
    + Defined in: plugins/sourcearea/plugin.js. + + +
    + + + + + + + + + + + + + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.skins.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.skins.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.skins.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.button.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.button.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.button.html (revision 2278) @@ -0,0 +1,850 @@ + + + + + + + JsDoc Reference - CKEDITOR.ui.button + + + + + + + + + + + + +
    + +
    Code Index +| File Index
    +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Class CKEDITOR.ui.button +

    + + +

    + + + + + +
    Defined in: plugins/button/plugin.js. + +

    + + + + + + + + + + + + + + + + + +
    Class Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.ui.button(definition) +
    +
    Represents a button UI element.
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Field Summary
    Field AttributesField Name and Description
    <static>   +
    + CKEDITOR.ui.button.handler +
    +
    Transforms a button definition in a CKEDITOR.ui.button instance.
    +
      +
    + command +
    +
    The command name associated to the button.
    +
      +
    + label +
    +
    The button label.
    +
      +
    + title +
    +
    The button advisory title.
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Method Summary
    Method AttributesMethod Name and Description
      +
    click() +
    +
    The function to be called when the user clicks the button.
    +
      +
    render(editor, output) +
    +
    Renders the button.
    +
    + + + + + + + +
    +
    + Class Detail +
    + +
    + CKEDITOR.ui.button(definition) +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Represents a button UI element. This class should not be called directly. To +create new buttons use CKEDITOR.ui.prototype.addButton instead. + +
    + + + + + + + + + +
    +
    Parameters:
    + +
    + {Object} definition + +
    +
    The button definition.
    + +
    + + + + + + + +
    + + + + +
    + Field Detail +
    + + +
    <static> + + {Undefined} + CKEDITOR.ui.button.handler + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Transforms a button definition in a CKEDITOR.ui.button instance. + + +
    + + + + + + + + + + + +
    + + +
    + + {String} + command + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + The command name associated to the button. If no command is defined, the +"click" event is used. + + +
    + + + + + + + + + + + +
    + + +
    + + {String} + label + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + The button label. + + +
    + + + + + + + + + + + +
    + + +
    + + {String} + title + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + The button advisory title. It is usually displayed as the button tooltip. +If not defined, the label is used. + + +
    + + + + + + + + + + + + + + + + + +
    + Method Detail +
    + + +
    + + {Function} + click() + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + The function to be called when the user clicks the button. If not +defined, the "command" property is required, and the command gets +executed on click. + + +
    + + + + + + + + + + + + + + +
    + + +
    + + {Undefined} + render(editor, output) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Renders the button. + + +
    + + + + + + + + +
    +
    Parameters:
    + +
    + {CKEDITOR.editor} editor + +
    +
    The editor instance which this button is + to be used by.
    + +
    + {Array} output + +
    +
    The output array to which append the HTML relative + to this button.
    + +
    + + + + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.handlerDefinition.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.handlerDefinition.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.handlerDefinition.html (revision 2278) @@ -0,0 +1,501 @@ + + + + + + + JsDoc Reference - CKEDITOR.ui.handlerDefinition + + + + + + + + + + + + +
    + +
    Code Index +| File Index
    +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Class CKEDITOR.ui.handlerDefinition +

    + + +

    + + + + + +
    Defined in: core/ui.js. + +

    + + + + + + + + + + + + + + + + + +
    Class Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.ui.handlerDefinition() +
    +
    (Virtual Class) Do not call this constructor.
    +
    + + + + + + + + + + +
    +
    + Class Detail +
    + +
    + CKEDITOR.ui.handlerDefinition() +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + (Virtual Class) Do not call this constructor. This class is not really part + of the API. It just illustrates the features of hanlder objects to be + passed to the CKEDITOR.ui.prototype.addHandler function. + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ui.html (revision 2278) @@ -0,0 +1,878 @@ + + + + + + + JsDoc Reference - CKEDITOR.ui + + + + + + + + + + + + +
    + +
    Code Index +| File Index
    +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Class CKEDITOR.ui +

    + + +

    + + + + + +
    Defined in: core/ui.js. + +

    + + + + + + + + + + + + + + + + + +
    Class Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.ui(editor) +
    +
    Contains UI features related to an editor instance.
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    Field Summary
    Field AttributesField Name and Description
    <static>   +
    + CKEDITOR.ui.separator +
    +
    The UI element that renders a toolbar separator.
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Method Summary
    Method AttributesMethod Name and Description
      +
    add(name, type, definition) +
    +
    Adds a UI item to the items collection.
    +
      +
    addButton(The, The) +
    +
    Adds a button definition to the UI elements list.
    +
      +
    addHandler(type, handler) +
    +
    Adds a handler for a UI item type.
    +
      +
    get(name) +
    +
    Gets a UI object.
    +
    + + + + + + + +
    +
    + Class Detail +
    + +
    + CKEDITOR.ui(editor) +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Contains UI features related to an editor instance. + +
    + + + + + + + + + +
    +
    Parameters:
    + +
    + {CKEDITOR.editor} editor + +
    +
    The editor instance.
    + +
    + + + + + + + +
    + + + + +
    + Field Detail +
    + + +
    <static> + + {Object} + CKEDITOR.ui.separator + +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + The UI element that renders a toolbar separator. + +
    + Defined in: plugins/toolbar/plugin.js. + + +
    + + + + + + + + + + + + + + + + + +
    + Method Detail +
    + + +
    + + {Undefined} + add(name, type, definition) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Adds a UI item to the items collection. These items can be later used in +the interface. + + +
    + + + + + 
    // Add a new button named "MyBold".
+editorInstance.ui.add( 'MyBold', CKEDITOR.UI_BUTTON,
+    {
+        label : 'My Bold',
+        command : 'bold'
+    });
    + + + + + +
    +
    Parameters:
    + +
    + {String} name + +
    +
    The UI item name.
    + +
    + {Object} type + +
    +
    The item type.
    + +
    + {Object} definition + +
    +
    The item definition. The properties of this + object depend on the item type.
    + +
    + + + + + + + +
    + + +
    + + {Undefined} + addButton(The, The) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Adds a button definition to the UI elements list. + +
    + Defined in: plugins/button/plugin.js. + + +
    + + + + + 
    editorInstance.ui.addButton( 'MyBold',
+    {
+        label : 'My Bold',
+        command : 'bold'
+    });
    + + + + + +
    +
    Parameters:
    + +
    + {String} The + +
    +
    button name.
    + +
    + {Object} The + +
    +
    button definition.
    + +
    + + + + + + + +
    + + +
    + + {Undefined} + addHandler(type, handler) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Adds a handler for a UI item type. The handler is responsible for +transforming UI item definitions in UI objects. + + +
    + + + + + + + + +
    +
    Parameters:
    + +
    + {Object} type + +
    +
    The item type.
    + +
    + {Object} handler + +
    +
    The handler definition.
    + +
    + + + + + + + +
    + + +
    + + {Undefined} + get(name) + +
    + + +
    + Since: + 3.0 +
    + +
    + + +
    + Gets a UI object. + + +
    + + + + + + + + +
    +
    Parameters:
    + +
    + {String} name + +
    +
    The UI item hame.
    + +
    + + + + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/_global_.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/_global_.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/_global_.html (revision 2278) @@ -198,4 +198,6 @@
  • CKEDITOR.ajax
    • + +
  • CKEDITOR.config
    • @@ -245,4 +247,10 @@
  • CKEDITOR.tools
    • + + + + + + @@ -265,4 +273,8 @@
  • + CKEDITOR.commandDefinition +
    • + +
    • @@ -358,4 +370,16 @@
  • +
    • + +
  • + CKEDITOR.ui +
    • + +
  • + CKEDITOR.ui.button +
    • + +
  • + CKEDITOR.ui.handlerDefinition
    • Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__commandDefinition.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__commandDefinition.js.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__commandDefinition.js.html (revision 2278) @@ -0,0 +1,59 @@ + 
      1 /*
+  2  * CKEditor - The text editor for Internet - http://ckeditor.com
+  3  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+  4  *
+  5  * == BEGIN LICENSE ==
+  6  *
+  7  * Licensed under the terms of any of the following licenses at your
+  8  * choice:
+  9  *
+ 10  *  - GNU General Public License Version 2 or later (the "GPL")
+ 11  *    http://www.gnu.org/licenses/gpl.html
+ 12  *
+ 13  *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ 14  *    http://www.gnu.org/licenses/lgpl.html
+ 15  *
+ 16  *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ 17  *    http://www.mozilla.org/MPL/MPL-1.1.html
+ 18  *
+ 19  * == END LICENSE ==
+ 20  */
+ 21
+ 22 /**
+ 23  * @fileOverview Defines the "virtual" {@link CKEDITOR.commandDefinition} class,
+ 24  *		which contains the defintion of a command. This file is for
+ 25  *		documentation purposes only.
+ 26  */
+ 27
+ 28 /**
+ 29  * (Virtual Class) Do not call this constructor. This class is not really part
+ 30  *		of the API. It just illustrates the features of command objects to be
+ 31  *		passed to the {@link CKEDITOR.editor.prototype.addCommand} function.
+ 32  * @name CKEDITOR.commandDefinition
+ 33  * @constructor
+ 34  * @example
+ 35  */
+ 36
+ 37  /**
+ 38  * Executes the command.
+ 39  * @name CKEDITOR.commandDefinition.prototype.exec
+ 40  * @function
+ 41  * @param {CKEDITOR.editor} editor The editor within which run the command.
+ 42  * @param {Object} [data] Additional data to be used to execute the command.
+ 43  * @example
+ 44  * editorInstance.addCommand( 'sample',
+ 45  * {
+ 46  *     exec : function( editor )
+ 47  *     {
+ 48  *         alert( 'Executing a command for the editor name "' + editor.name + '"!' );
+ 49  *     }
+ 50  * });
+ 51  */
+ 52
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__config.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__config.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__config.js.html (revision 2278) @@ -143,5 +143,5 @@ 136 * config.plugins = 'editingblock,toolbar,wysiwygarea'; 137 */ -138 plugins : 'basicstyles,editingblock,elementspath,htmldataprocessor,selection,sourcearea,toolbar,wysiwygarea', +138 plugins : 'basicstyles,button,editingblock,elementspath,htmldataprocessor,selection,sourcearea,toolbar,wysiwygarea', 139 140 /** Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_element.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_element.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_element.js.html (revision 2278) @@ -501,5 +501,51 @@ 494 this.setStyle( name, stylesPairs[ name ] ); 495 return this; -496 } -497 }); -498 +496 }, +497 +498 /** +499 * Makes the element unselectable. +500 * @function +501 * @example +502 * var element = CKEDITOR.dom.element.getById( 'myElement' ); +503 * element.unselectable(); +504 */ +505 unselectable : +506 CKEDITOR.env.gecko ? +507 function() +508 { +509 this.$.style.MozUserSelect = 'none'; +510 } +511 : CKEDITOR.env.webkit ? +512 function() +513 { +514 this.$.style.KhtmlUserSelect = 'none'; +515 } +516 : +517 function() +518 { +519 if ( CKEDITOR.env.ie || CKEDITOR.env.opera ) +520 { +521 var element = this.$, +522 e, +523 i = 0; +524 +525 element.unselectable = 'on'; +526 +527 while ( ( e = element.all[ i++ ] ) ) +528 { +529 switch ( e.tagName.toLowerCase() ) +530 { +531 case 'iframe' : +532 case 'textarea' : +533 case 'input' : +534 case 'select' : +535 /* Ignore the above tags */ +536 break; +537 default : +538 e.unselectable = 'on'; +539 } +540 } +541 } +542 } +543 }); +544 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html (revision 2278) @@ -155,172 +155,200 @@ 148 editor.plugins = plugins; 149 -150 // Initialize all plugins that have the "init" method defined. -151 for ( var i = 0 ; i < plugins.length ; i++ ) -152 { -153 var pluginName = plugins[ i ]; -154 var plugin = CKEDITOR.plugins.get( pluginName ); -155 if ( plugin && plugin.init ) -156 plugin.init( editor, CKEDITOR.plugins.getPath( pluginName ) ); -157 } -158 -159 // Load the editor skin and theme. -160 loadSkinTheme( editor ); -161 }); -162 }; -163 -164 var loadSkinTheme = function( editor ) -165 { -166 // Load the skin. -167 CKEDITOR.skins.load( editor.config.skin, 'editor' ); -168 -169 // Load the theme. -170 var theme = editor.config.theme; -171 CKEDITOR.themes.load( theme, function() -172 { -173 CKEDITOR.themes.get( theme ).build( editor, CKEDITOR.themes.getPath( theme ) ); -174 }); -175 }; -176 -177 return function( element, instanceConfig ) -178 { -179 this._ = -180 { -181 commands : {} -182 }; -183 -184 // Call the base constructor. -185 CKEDITOR.event.call( this ); -186 -187 /** -188 * The DOM element that has been replaced by this editor instance. This -189 * element holds the editor data on load and post. -190 * @name CKEDITOR.editor.prototype.element -191 * @type CKEDITOR.dom.element -192 * @example -193 * var editor = CKEDITOR.instances.editor1; -194 * alert( <b>editor.element</b>.getName() ); "textarea" -195 */ -196 this.element = element; -197 -198 /** -199 * The editor instance name. It hay be the replaced element id, name or -200 * a default name using a progressive counter (editor1, editor2, ...). -201 * @name CKEDITOR.editor.prototype.name -202 * @type String -203 * @example -204 * var editor = CKEDITOR.instances.editor1; -205 * alert( <b>editor.name</b> ); "editor1" -206 */ -207 this.name = element.getId() || element.getNameAtt() || getNewName(); -208 -209 /** -210 * The configurations for this editor instance. It inherits all -211 * settings defined in (@link CKEDITOR.config}, combined with settings -212 * loaded from custom configuration files and those defined inline in -213 * the page when creating the editor. -214 * @name CKEDITOR.editor.prototype.config -215 * @type Object -216 * @example -217 * var editor = CKEDITOR.instances.editor1; -218 * alert( <b>editor.config.theme</b> ); "default" e.g. -219 */ -220 this.config = new config(); -221 -222 // Call initConfig using events, to be sure that instanceCreated is -223 // fired first. -224 this.on( 'instanceCreated', function() -225 { -226 initConfig( this, instanceConfig ); -227 }); -228 }; -229 })(); -230 -231 CKEDITOR.editor.prototype = -232 { -233 addCommand : function( commandName, commandDefinition ) -234 { -235 this._.commands[ commandName ] = commandDefinition; -236 }, -237 -238 execCommand : function( commandName, data ) -239 { -240 var command = this.getCommand( commandName ); -241 if ( command ) -242 return command.exec( data ); -243 -244 throw 'Unknown command name "' + commandName + '"'; -245 }, -246 -247 getCommand : function( commandName ) -248 { -249 return this._.commands[ commandName ] || null; -250 }, -251 -252 // Both fire and fireOnce will always pass this editor instance as the -253 // "editor" param in CKEDITOR.event.fire. So, we override it to do that -254 // automaticaly. -255 -256 /** @ignore */ -257 fire : function( eventName, data ) -258 { -259 return CKEDITOR.event.prototype.fire.call( this, eventName, data, this ); -260 }, -261 -262 /** @ignore */ -263 fireOnce : function( eventName, data ) -264 { -265 return CKEDITOR.event.prototype.fireOnce.call( this, eventName, data, this ); -266 }, -267 -268 /** -269 * Gets the editor data. The data will be in raw format. It is the same -270 * data that is posted by the editor. -271 * @type String -272 * @returns (String) The editor data. -273 * @example -274 * if ( CKEDITOR.instances.editor1.<b>getData()</b> == '' ) -275 * alert( 'There is no data available' ); -276 */ -277 getData : function() -278 { -279 this.fire( 'beforeGetData' ); -280 -281 // Fire "getData" so data manipulation may happen. -282 var eventData = { dataValue : this._.data || this.element.$.value }; -283 this.fire( 'getData', eventData ); -284 -285 return eventData.dataValue; -286 }, -287 -288 /** -289 * Sets the editor data. The data must be provided in raw format. -290 * @example -291 * CKEDITOR.instances.editor1.<b>setData( '<p>This is the editor data.</p>' )</b>; -292 */ -293 setData : function( data ) -294 { -295 // Fire "setData" so data manipulation may happen. -296 var eventData = { dataValue : data }; -297 this.fire( 'setData', eventData ); -298 -299 this._.data = eventData.dataValue; -300 -301 this.fire( 'afterSetData' ); -302 }, -303 -304 /** -305 * Updates the <textarea> element that has been replaced by the editor with -306 * the current data available in the editor. -307 * @example -308 * CKEDITOR.instances.editor1.updateElement(); -309 * alert( document.getElementById( 'editor1' ).value ); // The current editor data. -310 */ -311 updateElement : function() -312 { -313 this.element.$.value = this.getData(); -314 } -315 }; -316 -317 // "Inherit" (copy actually) from CKEDITOR.event. -318 CKEDITOR.event.implementOn( CKEDITOR.editor.prototype ); -319 +150 // Initialize all plugins that have the "beforeInit" and "init" methods defined. +151 var methods = [ 'beforeInit', 'init' ]; +152 for ( var m = 0 ; m < methods.length ; m++ ) +153 { +154 for ( var i = 0 ; i < plugins.length ; i++ ) +155 { +156 var pluginName = plugins[ i ]; +157 var plugin = CKEDITOR.plugins.get( pluginName ); +158 if ( plugin && plugin[ methods[ m ] ] ) +159 plugin[ methods[ m ] ]( editor, CKEDITOR.plugins.getPath( pluginName ) ); +160 } +161 } +162 +163 // Load the editor skin and theme. +164 loadSkinTheme( editor ); +165 }); +166 }; +167 +168 var loadSkinTheme = function( editor ) +169 { +170 // Load the skin. +171 CKEDITOR.skins.load( editor.config.skin, 'editor' ); +172 +173 // Load the theme. +174 var theme = editor.config.theme; +175 CKEDITOR.themes.load( theme, function() +176 { +177 CKEDITOR.themes.get( theme ).build( editor, CKEDITOR.themes.getPath( theme ) ); +178 }); +179 }; +180 +181 return function( element, instanceConfig ) +182 { +183 this._ = +184 { +185 commands : {} +186 }; +187 +188 // Call the base constructor. +189 CKEDITOR.event.call( this ); +190 +191 /** +192 * The DOM element that has been replaced by this editor instance. This +193 * element holds the editor data on load and post. +194 * @name CKEDITOR.editor.prototype.element +195 * @type CKEDITOR.dom.element +196 * @example +197 * var editor = CKEDITOR.instances.editor1; +198 * alert( <b>editor.element</b>.getName() ); "textarea" +199 */ +200 this.element = element; +201 +202 /** +203 * The editor instance name. It hay be the replaced element id, name or +204 * a default name using a progressive counter (editor1, editor2, ...). +205 * @name CKEDITOR.editor.prototype.name +206 * @type String +207 * @example +208 * var editor = CKEDITOR.instances.editor1; +209 * alert( <b>editor.name</b> ); "editor1" +210 */ +211 this.name = element.getId() || element.getNameAtt() || getNewName(); +212 +213 /** +214 * The configurations for this editor instance. It inherits all +215 * settings defined in (@link CKEDITOR.config}, combined with settings +216 * loaded from custom configuration files and those defined inline in +217 * the page when creating the editor. +218 * @name CKEDITOR.editor.prototype.config +219 * @type Object +220 * @example +221 * var editor = CKEDITOR.instances.editor1; +222 * alert( <b>editor.config.theme</b> ); "default" e.g. +223 */ +224 this.config = new config(); +225 +226 /** +227 * Namespace containing UI features related to this editor instance. +228 * @name CKEDITOR.editor.prototype.ui +229 * @type CKEDITOR.ui +230 * @example +231 */ +232 this.ui = new CKEDITOR.ui( this ); +233 +234 // Call initConfig using events, to be sure that instanceCreated is +235 // fired first. +236 this.on( 'instanceCreated', function() +237 { +238 initConfig( this, instanceConfig ); +239 }); +240 }; +241 })(); +242 +243 CKEDITOR.editor.prototype = +244 { +245 /** +246 * Adds a command definition to the editor instance. Commands added with +247 * this function can be later executed with {@link #execCommand}. +248 * @param {String} commandName The indentifier name of the command. +249 * @param {CKEDITOR.commandDefinition} commandDefinition The command definition. +250 * @example +251 * editorInstance.addCommand( 'sample', +252 * { +253 * exec : function( editor ) +254 * { +255 * alert( 'Executing a command for the editor name "' + editor.name + '"!' ); +256 * } +257 * }); +258 */ +259 addCommand : function( commandName, commandDefinition ) +260 { +261 this._.commands[ commandName ] = commandDefinition; +262 }, +263 +264 /** +265 * Executes a command. +266 * @param {String} commandName The indentifier name of the command. +267 * @param {Object} [data] Data to be passed to the command +268 * @example +269 * editorInstance.execCommand( 'Bold' ); +270 */ +271 execCommand : function( commandName, data ) +272 { +273 var command = this._.commands[ commandName ]; +274 if ( command ) +275 return command.exec( this, data ); +276 +277 throw 'Unknown command name "' + commandName + '"'; +278 }, +279 +280 // Both fire and fireOnce will always pass this editor instance as the +281 // "editor" param in CKEDITOR.event.fire. So, we override it to do that +282 // automaticaly. +283 +284 /** @ignore */ +285 fire : function( eventName, data ) +286 { +287 return CKEDITOR.event.prototype.fire.call( this, eventName, data, this ); +288 }, +289 +290 /** @ignore */ +291 fireOnce : function( eventName, data ) +292 { +293 return CKEDITOR.event.prototype.fireOnce.call( this, eventName, data, this ); +294 }, +295 +296 /** +297 * Gets the editor data. The data will be in raw format. It is the same +298 * data that is posted by the editor. +299 * @type String +300 * @returns (String) The editor data. +301 * @example +302 * if ( CKEDITOR.instances.editor1.<b>getData()</b> == '' ) +303 * alert( 'There is no data available' ); +304 */ +305 getData : function() +306 { +307 this.fire( 'beforeGetData' ); +308 +309 // Fire "getData" so data manipulation may happen. +310 var eventData = { dataValue : this._.data || this.element.$.value }; +311 this.fire( 'getData', eventData ); +312 +313 return eventData.dataValue; +314 }, +315 +316 /** +317 * Sets the editor data. The data must be provided in raw format. +318 * @example +319 * CKEDITOR.instances.editor1.<b>setData( '<p>This is the editor data.</p>' )</b>; +320 */ +321 setData : function( data ) +322 { +323 // Fire "setData" so data manipulation may happen. +324 var eventData = { dataValue : data }; +325 this.fire( 'setData', eventData ); +326 +327 this._.data = eventData.dataValue; +328 +329 this.fire( 'afterSetData' ); +330 }, +331 +332 /** +333 * Updates the <textarea> element that has been replaced by the editor with +334 * the current data available in the editor. +335 * @example +336 * CKEDITOR.instances.editor1.updateElement(); +337 * alert( document.getElementById( 'editor1' ).value ); // The current editor data. +338 */ +339 updateElement : function() +340 { +341 this.element.$.value = this.getData(); +342 } +343 }; +344 +345 // "Inherit" (copy actually) from CKEDITOR.event. +346 CKEDITOR.event.implementOn( CKEDITOR.editor.prototype ); +347 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html (revision 2278) @@ -61,5 +61,5 @@ 54 'core/dom/text' : [ 'core/dom/node', 'core/dom/domobject' ], 55 'core/dom/window' : [ 'core/dom/domobject' ], - 56 'core/editor' : [ 'core/config', 'core/event', 'core/plugins', 'core/skins', 'core/themes', 'core/tools' ], + 56 'core/editor' : [ 'core/config', 'core/event', 'core/plugins', 'core/skins', 'core/themes', 'core/tools', 'core/ui' ], 57 'core/env' : [], 58 'core/event' : [], @@ -70,123 +70,124 @@ 63 'core/themes' : [ 'lang/en', 'core/resourceManager' ], 64 'core/tools' : [ 'core/env' ], - 65 'core/xml' : [ 'core/env' ] - 66 }; - 67 - 68 var basePath = (function() - 69 { - 70 // This is a copy of CKEDITOR.basePath, but requires the script having - 71 // "_source/core/loader.js". - 72 if ( CKEDITOR && CKEDITOR.basePath ) - 73 return CKEDITOR.basePath; - 74 - 75 // Find out the editor directory path, based on its <script> tag. - 76 var path = ''; - 77 var scripts = document.getElementsByTagName( 'script' ); - 78 - 79 for ( var i = 0 ; i < scripts.length ; i++ ) - 80 { - 81 var match = scripts[i].src.match( /(^|.*[\\\/])core\/loader.js(?:\?.*)?$/i ); - 82 - 83 if ( match ) - 84 { - 85 path = match[1]; - 86 break; - 87 } - 88 } - 89 - 90 // In IE (only) the script.src string is the raw valued entered in the - 91 // HTML. Other browsers return the full resolved URL instead. - 92 if ( path.indexOf('://') == -1 ) - 93 { - 94 // Absolute path. - 95 if ( path.indexOf( '/' ) === 0 ) - 96 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; - 97 // Relative path. - 98 else - 99 path = location.href.match( /^[^\?]*\// )[0] + path; -100 } -101 -102 return path; -103 })(); -104 -105 var timestamp = ( CKEDITOR && CKEDITOR.timestamp ) || ( new Date() ).valueOf(); // @Packager.RemoveLine -106 /* // @Packager.RemoveLine -107 * The production implementation contains a fixed timestamp // @Packager.RemoveLine -108 * generated by the releaser // @Packager.RemoveLine -109 var timestamp = '%TIMESTAMP%'; -110 */ // @Packager.RemoveLine -111 -112 var getUrl = function( resource ) -113 { -114 if ( CKEDITOR && CKEDITOR.getUrl ) -115 return CKEDITOR.getUrl( resource ); -116 -117 return basePath + resource + -118 ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) + -119 't=' + timestamp; -120 }; -121 -122 /** @lends CKEDITOR.loader */ -123 return { -124 /** -125 * The list of loaded scripts in their loading order. -126 * @type Array -127 * @example -128 * // Alert the loaded script names. -129 * alert( <b>CKEDITOR.loader.loadedScripts</b> ); -130 */ -131 loadedScripts : [], -132 -133 /** -134 * Loads a specific script, including its dependencies. This is not a -135 * synchronous loading, which means that the code the be loaded will -136 * not necessarily be available after this call. -137 * @example -138 * CKEDITOR.loader.load( 'core/dom/element' ); -139 */ -140 load : function( scriptName ) -141 { -142 // Check if the script has already been loaded. -143 if ( scriptName in this.loadedScripts ) -144 return; -145 -146 // Get the script dependencies list. -147 var dependencies = scripts[ scriptName ]; -148 if ( !dependencies ) -149 throw 'The script name"' + scriptName + '" is not defined.'; -150 -151 // Mark the script as loaded, even before really loading it, to -152 // avoid cross references recursion. -153 this.loadedScripts[ scriptName ] = true; -154 -155 // Load all dependencies first. -156 for ( var i = 0 ; i < dependencies.length ; i++ ) -157 this.load( dependencies[ i ] ); -158 -159 // Append this script to the list of loaded scripts. -160 this.loadedScripts.push( scriptName ); -161 -162 var scriptSrc = getUrl( '_source/' + scriptName + '.js' ); -163 -164 // Append the <script> element to the DOM. -165 if ( document.body ) -166 { -167 var script = document.createElement( 'script' ); -168 script.type = 'text/javascript'; -169 script.src = scriptSrc; -170 -171 document.body.appendChild( script ); -172 } -173 else -174 document.write( '<script src="' + scriptSrc + '" type="text/javascript"><\/script>' ); -175 } -176 }; -177 })(); -178 -179 // Check if any script has been defined for autoload. -180 if ( CKEDITOR._autoLoad ) -181 { -182 CKEDITOR.loader.load( CKEDITOR._autoLoad ); -183 delete CKEDITOR._autoLoad; -184 } -185 + 65 'core/ui' : [], + 66 'core/xml' : [ 'core/env' ] + 67 }; + 68 + 69 var basePath = (function() + 70 { + 71 // This is a copy of CKEDITOR.basePath, but requires the script having + 72 // "_source/core/loader.js". + 73 if ( CKEDITOR && CKEDITOR.basePath ) + 74 return CKEDITOR.basePath; + 75 + 76 // Find out the editor directory path, based on its <script> tag. + 77 var path = ''; + 78 var scripts = document.getElementsByTagName( 'script' ); + 79 + 80 for ( var i = 0 ; i < scripts.length ; i++ ) + 81 { + 82 var match = scripts[i].src.match( /(^|.*[\\\/])core\/loader.js(?:\?.*)?$/i ); + 83 + 84 if ( match ) + 85 { + 86 path = match[1]; + 87 break; + 88 } + 89 } + 90 + 91 // In IE (only) the script.src string is the raw valued entered in the + 92 // HTML. Other browsers return the full resolved URL instead. + 93 if ( path.indexOf('://') == -1 ) + 94 { + 95 // Absolute path. + 96 if ( path.indexOf( '/' ) === 0 ) + 97 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; + 98 // Relative path. + 99 else +100 path = location.href.match( /^[^\?]*\// )[0] + path; +101 } +102 +103 return path; +104 })(); +105 +106 var timestamp = ( CKEDITOR && CKEDITOR.timestamp ) || ( new Date() ).valueOf(); // @Packager.RemoveLine +107 /* // @Packager.RemoveLine +108 * The production implementation contains a fixed timestamp // @Packager.RemoveLine +109 * generated by the releaser // @Packager.RemoveLine +110 var timestamp = '%TIMESTAMP%'; +111 */ // @Packager.RemoveLine +112 +113 var getUrl = function( resource ) +114 { +115 if ( CKEDITOR && CKEDITOR.getUrl ) +116 return CKEDITOR.getUrl( resource ); +117 +118 return basePath + resource + +119 ( resource.indexOf( '?' ) >= 0 ? '&' : '?' ) + +120 't=' + timestamp; +121 }; +122 +123 /** @lends CKEDITOR.loader */ +124 return { +125 /** +126 * The list of loaded scripts in their loading order. +127 * @type Array +128 * @example +129 * // Alert the loaded script names. +130 * alert( <b>CKEDITOR.loader.loadedScripts</b> ); +131 */ +132 loadedScripts : [], +133 +134 /** +135 * Loads a specific script, including its dependencies. This is not a +136 * synchronous loading, which means that the code the be loaded will +137 * not necessarily be available after this call. +138 * @example +139 * CKEDITOR.loader.load( 'core/dom/element' ); +140 */ +141 load : function( scriptName ) +142 { +143 // Check if the script has already been loaded. +144 if ( scriptName in this.loadedScripts ) +145 return; +146 +147 // Get the script dependencies list. +148 var dependencies = scripts[ scriptName ]; +149 if ( !dependencies ) +150 throw 'The script name"' + scriptName + '" is not defined.'; +151 +152 // Mark the script as loaded, even before really loading it, to +153 // avoid cross references recursion. +154 this.loadedScripts[ scriptName ] = true; +155 +156 // Load all dependencies first. +157 for ( var i = 0 ; i < dependencies.length ; i++ ) +158 this.load( dependencies[ i ] ); +159 +160 // Append this script to the list of loaded scripts. +161 this.loadedScripts.push( scriptName ); +162 +163 var scriptSrc = getUrl( '_source/' + scriptName + '.js' ); +164 +165 // Append the <script> element to the DOM. +166 if ( document.body ) +167 { +168 var script = document.createElement( 'script' ); +169 script.type = 'text/javascript'; +170 script.src = scriptSrc; +171 +172 document.body.appendChild( script ); +173 } +174 else +175 document.write( '<script src="' + scriptSrc + '" type="text/javascript"><\/script>' ); +176 } +177 }; +178 })(); +179 +180 // Check if any script has been defined for autoload. +181 if ( CKEDITOR._autoLoad ) +182 { +183 CKEDITOR.loader.load( CKEDITOR._autoLoad ); +184 delete CKEDITOR._autoLoad; +185 } +186 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__pluginDefinition.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__pluginDefinition.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__pluginDefinition.js.html (revision 2278) @@ -34,28 +34,47 @@ 27 28 /** - 29 * This class is not really part of the API. It just illustrates the features - 30 * of plugin objects to passed to the {@link CKEDITOR.plugins.add} function. - 31 * @name CKEDITOR.pluginDefinition - 32 * @constructor - 33 * @example - 34 * // Do not do this. - 35 * var myEvent = new CKEDITOR.pluginDefinition(); // Error: CKEDITOR.pluginDefinition is undefined - 36 */ - 37 - 38 /** - 39 * Function called on initialization of every editor instance created in the - 40 * page. - 41 * @name CKEDITOR.pluginDefinition.prototype.init - 42 * @function - 43 * @param {CKEDITOR.editor} editor The editor instance being initialized. - 44 * @param {String} pluginPath The URL path for the plugin installation folder. - 45 * @example - 46 * CKEDITOR.plugins.add( 'sample', - 47 * { - 48 * init : function( editor, pluginPath ) - 49 * { - 50 * alert( 'Editor "' + editor.name + '" is being initialized!' ); - 51 * } - 52 * }); - 53 */ - 54 + 29 * (Virtual Class) Do not call this constructor. This class is not really part + 30 * of the API. It just illustrates the features of plugin objects to be + 31 * passed to the {@link CKEDITOR.plugins.add} function. + 32 * @name CKEDITOR.pluginDefinition + 33 * @constructor + 34 * @example + 35 */ + 36 + 37 /** + 38 * Function called on initialization of every editor instance created in the + 39 * page before the init() call task. The beforeInit function will be called for + 40 * all plugins, after that the init function is called for all of them. This + 41 * feature makes it possible to initialize things that could be used in the + 42 * init function of other plugins. + 43 * @name CKEDITOR.pluginDefinition.prototype.beforeInit + 44 * @function + 45 * @param {CKEDITOR.editor} editor The editor instance being initialized. + 46 * @param {String} pluginPath The URL path for the plugin installation folder. + 47 * @example + 48 * CKEDITOR.plugins.add( 'sample', + 49 * { + 50 * beforeInit : function( editor, pluginPath ) + 51 * { + 52 * alert( 'Editor "' + editor.name + '" is to be initialized!' ); + 53 * } + 54 * }); + 55 */ + 56 + 57 /** + 58 * Function called on initialization of every editor instance created in the + 59 * page. + 60 * @name CKEDITOR.pluginDefinition.prototype.init + 61 * @function + 62 * @param {CKEDITOR.editor} editor The editor instance being initialized. + 63 * @param {String} pluginPath The URL path for the plugin installation folder. + 64 * @example + 65 * CKEDITOR.plugins.add( 'sample', + 66 * { + 67 * init : function( editor, pluginPath ) + 68 * { + 69 * alert( 'Editor "' + editor.name + '" is being initialized!' ); + 70 * } + 71 * }); + 72 */ + 73 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ui.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ui.js.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ui.js.html (revision 2278) @@ -0,0 +1,119 @@ + 
      1 /*
+  2  * CKEditor - The text editor for Internet - http://ckeditor.com
+  3  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+  4  *
+  5  * == BEGIN LICENSE ==
+  6  *
+  7  * Licensed under the terms of any of the following licenses at your
+  8  * choice:
+  9  *
+ 10  *  - GNU General Public License Version 2 or later (the "GPL")
+ 11  *    http://www.gnu.org/licenses/gpl.html
+ 12  *
+ 13  *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ 14  *    http://www.gnu.org/licenses/lgpl.html
+ 15  *
+ 16  *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ 17  *    http://www.mozilla.org/MPL/MPL-1.1.html
+ 18  *
+ 19  * == END LICENSE ==
+ 20  */
+ 21
+ 22 /**
+ 23  * Contains UI features related to an editor instance.
+ 24  * @constructor
+ 25  * @param {CKEDITOR.editor} editor The editor instance.
+ 26  * @example
+ 27  */
+ 28 CKEDITOR.ui = function( editor )
+ 29 {
+ 30 	if ( editor.ui )
+ 31 		return editor.ui;
+ 32
+ 33 	this._ =
+ 34 	{
+ 35 		handlers : {},
+ 36 		items : {}
+ 37 	};
+ 38
+ 39 	return this;
+ 40 };
+ 41
+ 42 CKEDITOR.ui.prototype =
+ 43 {
+ 44 	/**
+ 45 	 * Adds a UI item to the items collection. These items can be later used in
+ 46 	 * the interface.
+ 47 	 * @param {String} name The UI item name.
+ 48 	 * @param {Object} type The item type.
+ 49 	 * @param {Object} definition The item definition. The properties of this
+ 50 	 *		object depend on the item type.
+ 51 	 * @example
+ 52 	 * // Add a new button named "MyBold".
+ 53 	 * editorInstance.ui.add( 'MyBold', CKEDITOR.UI_BUTTON,
+ 54 	 *     {
+ 55 	 *         label : 'My Bold',
+ 56 	 *         command : 'bold'
+ 57 	 *     });
+ 58 	 */
+ 59 	add : function( name, type, definition )
+ 60 	{
+ 61 		var item = this._.handlers[ type ].create( definition );
+ 62 		item.name = name;
+ 63 		this._.items[ name ] = item;
+ 64 	},
+ 65
+ 66 	/**
+ 67 	 * Gets a UI object.
+ 68 	 * @param {String} name The UI item hame.
+ 69 	 * @example
+ 70 	 */
+ 71 	get : function( name )
+ 72 	{
+ 73 		return this._.items[ name ] || null;
+ 74 	},
+ 75
+ 76 	/**
+ 77 	 * Adds a handler for a UI item type. The handler is responsible for
+ 78 	 * transforming UI item definitions in UI objects.
+ 79 	 * @param {Object} type The item type.
+ 80 	 * @param {Object} handler The handler definition.
+ 81 	 * @example
+ 82 	 */
+ 83 	addHandler : function( type, handler )
+ 84 	{
+ 85 		this._.handlers[ type ] = handler;
+ 86 	}
+ 87 };
+ 88
+ 89 /**
+ 90  * (Virtual Class) Do not call this constructor. This class is not really part
+ 91  *		of the API. It just illustrates the features of hanlder objects to be
+ 92  *		passed to the {@link CKEDITOR.ui.prototype.addHandler} function.
+ 93  * @name CKEDITOR.ui.handlerDefinition
+ 94  * @constructor
+ 95  * @example
+ 96  */
+ 97
+ 98  /**
+ 99  * Transforms an item definition into an UI item object.
+100  * @name CKEDITOR.handlerDefinition.prototype.create
+101  * @function
+102  * @param {Object} definition The item definition.
+103  * @example
+104  * editorInstance.ui.addHandler( CKEDITOR.UI_BUTTON,
+105  *     {
+106  *         create : function( definition )
+107  *         {
+108  *             return new CKEDITOR.ui.button( definition );
+109  *         }
+110  *     });
+111  */
+112
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__basicstyles_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__basicstyles_plugin.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__basicstyles_plugin.js.html (revision 2278) @@ -31,29 +31,61 @@ 24 init : function( editor, pluginPath ) 25 { - 26 editor.addCommand( 'bold', - 27 { - 28 exec : function() - 29 { - 30 editor.focus(); - 31 - 32 var doc = editor.document; - 33 if ( doc ) - 34 return doc.$.execCommand( 'bold', false, null ); - 35 return false; - 36 } - 37 }); - 38 - 39 editor.addCommand( 'italic', - 40 { - 41 exec : function() - 42 { - 43 editor.focus(); - 44 var doc = editor.document; - 45 if ( doc ) - 46 return doc.$.execCommand( 'italic', false, null ); - 47 return false; - 48 } - 49 }); - 50 } - 51 }); - 52 + 26 var basicstyles = CKEDITOR.plugins.basicstyles, + 27 commands = basicstyles.commands, + 28 ui = basicstyles.ui; + 29 + 30 editor.addCommand( 'bold', commands.bold ); + 31 editor.addCommand( 'italic', commands.italic ); + 32 + 33 editor.ui.addButton( 'Bold', ui.bold ); + 34 editor.ui.addButton( 'Italic', ui.italic ); + 35 } + 36 }); + 37 + 38 CKEDITOR.plugins.basicstyles = + 39 { + 40 commands : + 41 { + 42 bold : + 43 { + 44 exec : function( editor ) + 45 { + 46 editor.focus(); + 47 + 48 var doc = editor.document; + 49 if ( doc ) + 50 return doc.$.execCommand( 'bold', false, null ); + 51 return false; + 52 } + 53 }, + 54 + 55 italic : + 56 { + 57 exec : function( editor ) + 58 { + 59 editor.focus(); + 60 + 61 var doc = editor.document; + 62 if ( doc ) + 63 return doc.$.execCommand( 'italic', false, null ); + 64 return false; + 65 } + 66 } + 67 }, + 68 + 69 ui : + 70 { + 71 bold : + 72 { + 73 label : 'Bold', + 74 command : 'bold' + 75 }, + 76 + 77 italic : + 78 { + 79 label : 'Italic', + 80 command : 'italic' + 81 } + 82 } + 83 }; + 84 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__button_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__button_plugin.js.html (revision 2278) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__button_plugin.js.html (revision 2278) @@ -0,0 +1,159 @@ + 
      1 /*
+  2  * CKEditor - The text editor for Internet - http://ckeditor.com
+  3  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+  4  *
+  5  * == BEGIN LICENSE ==
+  6  *
+  7  * Licensed under the terms of any of the following licenses at your
+  8  * choice:
+  9  *
+ 10  *  - GNU General Public License Version 2 or later (the "GPL")
+ 11  *    http://www.gnu.org/licenses/gpl.html
+ 12  *
+ 13  *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ 14  *    http://www.gnu.org/licenses/lgpl.html
+ 15  *
+ 16  *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ 17  *    http://www.mozilla.org/MPL/MPL-1.1.html
+ 18  *
+ 19  * == END LICENSE ==
+ 20  */
+ 21
+ 22 CKEDITOR.plugins.add( 'button',
+ 23 {
+ 24 	beforeInit : function( editor )
+ 25 	{
+ 26 		editor.ui.addHandler( CKEDITOR.UI_BUTTON, CKEDITOR.ui.button.handler );
+ 27 	}
+ 28 });
+ 29
+ 30 /**
+ 31  * Button UI element.
+ 32  * @constant
+ 33  * @example
+ 34  */
+ 35 CKEDITOR.UI_BUTTON = 1;
+ 36
+ 37 /**
+ 38  * Represents a button UI element. This class should not be called directly. To
+ 39  * create new buttons use {@link CKEDITOR.ui.prototype.addButton} instead.
+ 40  * @constructor
+ 41  * @param {Object} definition The button definition.
+ 42  * @example
+ 43  */
+ 44 CKEDITOR.ui.button = function( definition )
+ 45 {
+ 46 	/**
+ 47 	 * The button label.
+ 48 	 * @name CKEDITOR.ui.button.prototype.label
+ 49 	 * @type String
+ 50 	 * @example
+ 51 	 */
+ 52 	this.label = definition.label;
+ 53
+ 54 	/**
+ 55 	 * The command name associated to the button. If no command is defined, the
+ 56 	 * "click" event is used.
+ 57 	 * @name CKEDITOR.ui.button.prototype.command
+ 58 	 * @type String
+ 59 	 * @example
+ 60 	 */
+ 61 	this.command = definition.command;
+ 62
+ 63 	/**
+ 64 	 * The button advisory title. It is usually displayed as the button tooltip.
+ 65 	 * If not defined, the label is used.
+ 66 	 * @name CKEDITOR.ui.button.prototype.title
+ 67 	 * @type String
+ 68 	 * @example
+ 69 	 */
+ 70 	this.title = definition.title || this.label;
+ 71
+ 72 	/**
+ 73 	 * The function to be called when the user clicks the button. If not
+ 74 	 * defined, the "command" property is required, and the command gets
+ 75 	 * executed on click.
+ 76 	 * @function
+ 77 	 * @name CKEDITOR.ui.button.prototype.click
+ 78 	 * @type Function
+ 79 	 * @example
+ 80 	 */
+ 81 	this.click = definition.click || function( editor )
+ 82 		{
+ 83 			editor.execCommand( definition.command );
+ 84 		};
+ 85 };
+ 86
+ 87 /**
+ 88  * Transforms a button definition in a {@link CKEDITOR.ui.button} instance.
+ 89  * @example
+ 90  */
+ 91 CKEDITOR.ui.button.handler =
+ 92 {
+ 93 	create : function( definition )
+ 94 	{
+ 95 		return new CKEDITOR.ui.button( definition );
+ 96 	}
+ 97 };
+ 98
+ 99 CKEDITOR.ui.button.prototype =
+100 {
+101 	/**
+102 	 * Renders the button.
+103 	 * @param {CKEDITOR.editor} editor The editor instance which this button is
+104 	 *		to be used by.
+105 	 * @param {Array} output The output array to which append the HTML relative
+106 	 *		to this button.
+107 	 * @example
+108 	 */
+109 	render : function( editor, output )
+110 	{
+111 		output.push(
+112 			'<a id="cke_', CKEDITOR.tools.getNextNumber(),
+113 				'" class="cke_button" href="do:', this.label,
+114 				'" title="', this.title,
+115 				'" onclick="return CKEDITOR.ui.button._.click(\'', editor.name, '\',\'', this.name, '\', this.id);">',
+116 			this.label, '</a>' );
+117 	}
+118 };
+119
+120 /**
+121  * Handles a button click.
+122  * @private
+123  */
+124 CKEDITOR.ui.button._ =
+125 {
+126 	click : function( instanceName, uiItemName, elementId )
+127 	{
+128 		var editor = CKEDITOR.instances[ instanceName ];
+129 		editor.focus();
+130
+131 		var uiItem = editor.ui.get( uiItemName ).click( editor, elementId );
+132
+133 		return false;
+134 	}
+135 };
+136
+137 /**
+138  * Adds a button definition to the UI elements list.
+139  * @param {String} The button name.
+140  * @param {Object} The button definition.
+141  * @example
+142  * editorInstance.ui.addButton( 'MyBold',
+143  *     {
+144  *         label : 'My Bold',
+145  *         command : 'bold'
+146  *     });
+147  */
+148 CKEDITOR.ui.prototype.addButton = function( name, definition )
+149 {
+150 	this.add( name, CKEDITOR.UI_BUTTON, definition );
+151 };
+152
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__elementspath_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__elementspath_plugin.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__elementspath_plugin.js.html (revision 2278) @@ -36,11 +36,61 @@ 29 init : function( editor, pluginPath ) 30 { - 31 editor.on( 'themeSpace', function( event ) - 32 { - 33 if ( event.data.space == 'bottom' ) - 34 event.data.html += - 35 '<div>Elements Path!</div>'; - 36 }); - 37 } - 38 }); - 39 + 31 var spaceId = 'cke_path_' + editor.name; + 32 var spaceElement; + 33 var getSpaceElement = function() + 34 { + 35 if ( !spaceElement ) + 36 spaceElement = CKEDITOR.document.getById( spaceId ); + 37 return spaceElement; + 38 }; + 39 + 40 editor.on( 'themeSpace', function( event ) + 41 { + 42 if ( event.data.space == 'bottom' ) + 43 event.data.html += '<div id="' + spaceId + '" class="cke_path"><br></div>'; + 44 }); + 45 + 46 editor.on( 'selectionChange', function() + 47 { + 48 var element = this.getSelection().getStartElement(), + 49 html = [], + 50 elementsList = this._.elementsPathList = []; + 51 + 52 while ( element ) + 53 { + 54 var index = elementsList.push( element ) - 1, + 55 name = element.getName(); + 56 + 57 html.unshift( '<a href="element:', name, '" onclick="return CKEDITOR._.elementsPathClick( \'', this.name, '\',', index, ');">', name, '</a>' ); + 58 + 59 if ( name == 'body' ) + 60 break; + 61 + 62 element = element.getParent(); + 63 } + 64 + 65 getSpaceElement().setHtml( html.join('') ); + 66 }); + 67 + 68 editor.on( 'contentDomUnload', function() + 69 { + 70 getSpaceElement().setHtml( '<br>' ); + 71 }); + 72 } + 73 }); + 74 + 75 /** + 76 * Handles the click on an element in the element path. + 77 * @private + 78 */ + 79 CKEDITOR._.elementsPathClick = function( instanceName, elementIndex ) + 80 { + 81 var editor = CKEDITOR.instances[ instanceName ]; + 82 editor.focus(); + 83 + 84 var element = editor._.elementsPathList[ elementIndex ]; + 85 editor.getSelection().selectElement( element ); + 86 + 87 return false; + 88 }; + 89 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__selection_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__selection_plugin.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__selection_plugin.js.html (revision 2278) @@ -67,279 +67,330 @@ 60 61 var checkSelectionChangeTimer; - 62 var checkSelectionChangeTimeout = function() - 63 { - 64 if ( checkSelectionChangeTimer ) - 65 window.clearTimeout( checkSelectionChangeTimer ); - 66 - 67 checkSelectionChangeTimer = CKEDITOR.tools.setTimeout( checkSelectionChange, 100, this ); - 68 }; - 69 - 70 // #### checkSelectionChange : END - 71 - 72 CKEDITOR.plugins.add( 'selection', - 73 { - 74 init : function( editor, pluginPath ) - 75 { - 76 editor.on( 'contentDom', function() - 77 { - 78 if ( CKEDITOR.env.ie ) - 79 { - 80 // IE is the only to provide the "selectionchange" - 81 // event. - 82 editor.document.on( 'selectionchange', checkSelectionChange, editor ); - 83 } - 84 else - 85 { - 86 // In other browsers, we make the selection change - 87 // check based on other events, like clicks or keys - 88 // press. - 89 - 90 editor.document.on( 'mouseup', checkSelectionChange, editor ); - 91 - 92 // Firing the "OnSelectionChange" event on every key - 93 // press started to be too slow. So, a timer has been - 94 // implemented to solve performance issues when typing - 95 // to quickly. - 96 editor.document.on( 'keyup', checkSelectionChangeTimeout, editor ); - 97 } - 98 }); - 99 } -100 }); -101 })(); -102 -103 /** -104 * Gets the current selection from the editing area when in WYSIWYG mode. -105 * @returns {CKEDITOR.dom.selection} A selection object or null if not on -106 * WYSIWYG mode or no selection is available. -107 * @example -108 * var selection = CKEDITOR.instances.editor1.<b>getSelection()</b>; -109 * alert( selection.getType() ); -110 */ -111 CKEDITOR.editor.prototype.getSelection = function() -112 { -113 return this.document ? this.document.getSelection() : null; -114 }; -115 -116 /** -117 * Gets the current selection from the document. -118 * @returns {CKEDITOR.dom.selection} A selection object. -119 * @example -120 * var selection = CKEDITOR.instances.editor1.document.<b>getSelection()</b>; -121 * alert( selection.getType() ); -122 */ -123 CKEDITOR.dom.document.prototype.getSelection = function() -124 { -125 return new CKEDITOR.dom.selection( this ); -126 }; -127 -128 /** -129 * No selection. -130 * @constant -131 * @example -132 * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_NONE ) -133 * alert( 'Nothing is selected' ); -134 */ -135 CKEDITOR.SELECTION_NONE = 1; -136 -137 /** -138 * Text or collapsed selection. -139 * @constant -140 * @example -141 * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT ) -142 * alert( 'Text is selected' ); -143 */ -144 CKEDITOR.SELECTION_TEXT = 2; -145 -146 /** -147 * Element selection. -148 * @constant -149 * @example -150 * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT ) -151 * alert( 'An element is selected' ); -152 */ -153 CKEDITOR.SELECTION_ELEMENT = 3; -154 -155 /** -156 * Manipulates the selection in a DOM document. -157 * @constructor -158 * @example -159 */ -160 CKEDITOR.dom.selection = function( document ) -161 { -162 this.document = document; -163 }; -164 -165 (function() -166 { -167 var styleObjectElements = { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 }; -168 -169 CKEDITOR.dom.selection.prototype = -170 { -171 /** -172 * Gets the native selection object from the browser. -173 * @returns {Object} The native selection object. -174 * @example -175 * var selection = editor.getSelection().<b>getNative()</b>; -176 */ -177 getNative : (function() -178 { -179 if ( CKEDITOR.env.ie ) -180 return function() -181 { -182 return this.document.$.selection; -183 }; -184 else -185 return function() -186 { -187 return this.document.getWindow().$.getSelection(); -188 }; -189 })(), -190 + 62 var checkSelectionChangeTimeoutPending; + 63 var checkSelectionChangeTimeout = function() + 64 { + 65 // Firing the "OnSelectionChange" event on every key press started to + 66 // be too slow. This function guarantees that there will be at least + 67 // 200ms delay between selection checks. + 68 + 69 checkSelectionChangeTimeoutPending = true; + 70 + 71 if ( checkSelectionChangeTimer ) + 72 return; + 73 + 74 checkSelectionChangeTimeoutExec.call( this ); + 75 + 76 checkSelectionChangeTimer = CKEDITOR.tools.setTimeout( checkSelectionChangeTimeoutExec, 200, this ); + 77 }; + 78 + 79 var checkSelectionChangeTimeoutExec = function() + 80 { + 81 checkSelectionChangeTimer = null; + 82 + 83 if ( checkSelectionChangeTimeoutPending ) + 84 { + 85 // Call this with a timeout so the browser properly moves the + 86 // selection after the mouseup. It happened that the selection was + 87 // being moved after the mouseup when clicking inside selected text + 88 // with Firefox. + 89 CKEDITOR.tools.setTimeout( checkSelectionChange, 0, this ); + 90 + 91 checkSelectionChangeTimeoutPending = false; + 92 } + 93 }; + 94 + 95 // #### checkSelectionChange : END + 96 + 97 CKEDITOR.plugins.add( 'selection', + 98 { + 99 init : function( editor, pluginPath ) +100 { +101 editor.on( 'contentDom', function() +102 { +103 if ( CKEDITOR.env.ie ) +104 { +105 // IE is the only to provide the "selectionchange" +106 // event. +107 editor.document.on( 'selectionchange', checkSelectionChangeTimeout, editor ); +108 } +109 else +110 { +111 // In other browsers, we make the selection change +112 // check based on other events, like clicks or keys +113 // press. +114 +115 editor.document.on( 'mouseup', checkSelectionChangeTimeout, editor ); +116 editor.document.on( 'keyup', checkSelectionChangeTimeout, editor ); +117 } +118 }); +119 } +120 }); +121 })(); +122 +123 /** +124 * Gets the current selection from the editing area when in WYSIWYG mode. +125 * @returns {CKEDITOR.dom.selection} A selection object or null if not on +126 * WYSIWYG mode or no selection is available. +127 * @example +128 * var selection = CKEDITOR.instances.editor1.<b>getSelection()</b>; +129 * alert( selection.getType() ); +130 */ +131 CKEDITOR.editor.prototype.getSelection = function() +132 { +133 return this.document ? this.document.getSelection() : null; +134 }; +135 +136 /** +137 * Gets the current selection from the document. +138 * @returns {CKEDITOR.dom.selection} A selection object. +139 * @example +140 * var selection = CKEDITOR.instances.editor1.document.<b>getSelection()</b>; +141 * alert( selection.getType() ); +142 */ +143 CKEDITOR.dom.document.prototype.getSelection = function() +144 { +145 return new CKEDITOR.dom.selection( this ); +146 }; +147 +148 /** +149 * No selection. +150 * @constant +151 * @example +152 * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_NONE ) +153 * alert( 'Nothing is selected' ); +154 */ +155 CKEDITOR.SELECTION_NONE = 1; +156 +157 /** +158 * Text or collapsed selection. +159 * @constant +160 * @example +161 * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT ) +162 * alert( 'Text is selected' ); +163 */ +164 CKEDITOR.SELECTION_TEXT = 2; +165 +166 /** +167 * Element selection. +168 * @constant +169 * @example +170 * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT ) +171 * alert( 'An element is selected' ); +172 */ +173 CKEDITOR.SELECTION_ELEMENT = 3; +174 +175 /** +176 * Manipulates the selection in a DOM document. +177 * @constructor +178 * @example +179 */ +180 CKEDITOR.dom.selection = function( document ) +181 { +182 this.document = document; +183 }; +184 +185 (function() +186 { +187 var styleObjectElements = { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 }; +188 +189 CKEDITOR.dom.selection.prototype = +190 { 191 /** -192 * Gets the type of the current selection. The following values are -193 * available: -194 * <ul> -195 * <li>{@link CKEDITOR.SELECTION_NONE} (1): No selection.</li> -196 * <li>{@link CKEDITOR.SELECTION_TEXT} (2): Text is selected or -197 * collapsed selection.</li> -198 * <li>{@link CKEDITOR.SELECTION_ELEMENT} (3): A element -199 * selection.</li> -200 * </ul> -201 * @returns {Number} One of the following constant values: -202 * {@link CKEDITOR.SELECTION_NONE}, {@link CKEDITOR.SELECTION_TEXT} or -203 * {@link CKEDITOR.SELECTION_ELEMENT}. -204 * @example -205 * if ( editor.getSelection().<b>getType()</b> == CKEDITOR.SELECTION_TEXT ) -206 * alert( 'Text is selected' ); -207 */ -208 getType : (function() -209 { -210 if ( CKEDITOR.env.ie ) -211 return function() -212 { -213 try -214 { -215 var sel = this.getNative(), -216 ieType = sel.type; -217 -218 if ( ieType == 'Text' ) -219 return CKEDITOR.SELECTION_TEXT; -220 -221 if ( ieType == 'Control' ) -222 return CKEDITOR.SELECTION_ELEMENT; -223 -224 // It is possible that we can still get a text range -225 // object even when type == 'None' is returned by IE. -226 // So we'd better check the object returned by -227 // createRange() rather than by looking at the type. -228 if ( sel.createRange().parentElement ) -229 return CKEDITOR.SELECTION_TEXT; -230 } -231 catch(e) {} -232 -233 return CKEDITOR.SELECTION_NONE; -234 }; -235 else -236 return function() -237 { -238 var sel = this.getNative(); -239 if ( !sel ) -240 return CKEDITOR.SELECTION_NONE; -241 -242 if ( sel.rangeCount == 1 ) -243 { -244 // Check if the actual selection is a control (IMG, -245 // TABLE, HR, etc...). -246 -247 var range = sel.getRangeAt(0), -248 startContainer = range.startContainer; +192 * Gets the native selection object from the browser. +193 * @returns {Object} The native selection object. +194 * @example +195 * var selection = editor.getSelection().<b>getNative()</b>; +196 */ +197 getNative : +198 CKEDITOR.env.ie ? +199 function() +200 { +201 return this.document.$.selection; +202 } +203 : +204 function() +205 { +206 return this.document.getWindow().$.getSelection(); +207 }, +208 +209 /** +210 * Gets the type of the current selection. The following values are +211 * available: +212 * <ul> +213 * <li>{@link CKEDITOR.SELECTION_NONE} (1): No selection.</li> +214 * <li>{@link CKEDITOR.SELECTION_TEXT} (2): Text is selected or +215 * collapsed selection.</li> +216 * <li>{@link CKEDITOR.SELECTION_ELEMENT} (3): A element +217 * selection.</li> +218 * </ul> +219 * @returns {Number} One of the following constant values: +220 * {@link CKEDITOR.SELECTION_NONE}, {@link CKEDITOR.SELECTION_TEXT} or +221 * {@link CKEDITOR.SELECTION_ELEMENT}. +222 * @example +223 * if ( editor.getSelection().<b>getType()</b> == CKEDITOR.SELECTION_TEXT ) +224 * alert( 'Text is selected' ); +225 */ +226 getType : +227 CKEDITOR.env.ie ? +228 function() +229 { +230 try +231 { +232 var sel = this.getNative(), +233 ieType = sel.type; +234 +235 if ( ieType == 'Text' ) +236 return CKEDITOR.SELECTION_TEXT; +237 +238 if ( ieType == 'Control' ) +239 return CKEDITOR.SELECTION_ELEMENT; +240 +241 // It is possible that we can still get a text range +242 // object even when type == 'None' is returned by IE. +243 // So we'd better check the object returned by +244 // createRange() rather than by looking at the type. +245 if ( sel.createRange().parentElement ) +246 return CKEDITOR.SELECTION_TEXT; +247 } +248 catch(e) {} 249 -250 if ( startContainer == range.endContainer -251 && startContainer.nodeType == 1 -252 && ( range.endOffset - range.startOffset ) == 1 -253 && styleObjectElements[ startContainer.childNodes[ range.startOffset ].nodeName.toLowerCase() ] ) -254 { -255 return CKEDITOR.SELECTION_ELEMENT; -256 } -257 } +250 return CKEDITOR.SELECTION_NONE; +251 } +252 : +253 function() +254 { +255 var sel = this.getNative(); +256 if ( !sel ) +257 return CKEDITOR.SELECTION_NONE; 258 -259 return CKEDITOR.SELECTION_TEXT; -260 }; -261 })(), -262 -263 /** -264 * Gets the DOM element in which the selection starts. -265 * @returns {CKEDITOR.dom.element} The element at the beginning of the -266 * selection. -267 * @example -268 * var element = editor.getSelection().<b>getStartElement()</b>; -269 * alert( element.getName() ); -270 */ -271 getStartElement : function() -272 { -273 var node, -274 sel = this.getNative(); +259 if ( sel.rangeCount == 1 ) +260 { +261 // Check if the actual selection is a control (IMG, +262 // TABLE, HR, etc...). +263 +264 var range = sel.getRangeAt(0), +265 startContainer = range.startContainer; +266 +267 if ( startContainer == range.endContainer +268 && startContainer.nodeType == 1 +269 && ( range.endOffset - range.startOffset ) == 1 +270 && styleObjectElements[ startContainer.childNodes[ range.startOffset ].nodeName.toLowerCase() ] ) +271 { +272 return CKEDITOR.SELECTION_ELEMENT; +273 } +274 } 275 -276 switch ( this.getType() ) -277 { -278 case CKEDITOR.SELECTION_ELEMENT : -279 return this.getSelectedElement(); -280 -281 case CKEDITOR.SELECTION_TEXT : -282 -283 if ( CKEDITOR.env.ie ) -284 { -285 var range = sel.createRange(); -286 range.collapse( true ); -287 -288 node = range.parentElement(); -289 } -290 else -291 { -292 node = sel.anchorNode; -293 -294 if ( node.nodeType != 1 ) -295 node = node.parentNode; -296 } -297 } +276 return CKEDITOR.SELECTION_TEXT; +277 }, +278 +279 /** +280 * Gets the DOM element in which the selection starts. +281 * @returns {CKEDITOR.dom.element} The element at the beginning of the +282 * selection. +283 * @example +284 * var element = editor.getSelection().<b>getStartElement()</b>; +285 * alert( element.getName() ); +286 */ +287 getStartElement : function() +288 { +289 var node, +290 sel = this.getNative(); +291 +292 switch ( this.getType() ) +293 { +294 case CKEDITOR.SELECTION_ELEMENT : +295 return this.getSelectedElement(); +296 +297 case CKEDITOR.SELECTION_TEXT : 298 -299 return ( node ? new CKEDITOR.dom.element( node ) : null ); -300 }, -301 -302 /** -303 * Gets the current selected element. -304 * @returns {CKEDITOR.dom.element} The selected element. Null if no -305 * selection is available or the selection type is not -306 * {@link CKEDITOR.SELECTION_ELEMENT}. -307 * @example -308 * var element = editor.getSelection().<b>getSelectedElement()</b>; -309 * alert( element.getName() ); -310 */ -311 getSelectedElement : function() -312 { -313 var node; +299 if ( CKEDITOR.env.ie ) +300 { +301 var range = sel.createRange(); +302 range.collapse( true ); +303 +304 node = range.parentElement(); +305 } +306 else +307 { +308 node = sel.anchorNode; +309 +310 if ( node.nodeType != 1 ) +311 node = node.parentNode; +312 } +313 } 314 -315 if ( this.getType() == CKEDITOR.SELECTION_ELEMENT ) -316 { -317 var sel = this.getNative(); -318 -319 if ( CKEDITOR.env.ie ) -320 { -321 try -322 { -323 node = sel.createRange().item(0); -324 } -325 catch(e) {} -326 } -327 else -328 { -329 var range = sel.getRangeAt( 0 ); -330 node = range.startContainer.childNodes[ range.startOffset ]; -331 } -332 } -333 -334 return ( node ? new CKEDITOR.dom.element( node ) : null ); -335 } -336 }; -337 })(); -338 +315 return ( node ? new CKEDITOR.dom.element( node ) : null ); +316 }, +317 +318 /** +319 * Gets the current selected element. +320 * @returns {CKEDITOR.dom.element} The selected element. Null if no +321 * selection is available or the selection type is not +322 * {@link CKEDITOR.SELECTION_ELEMENT}. +323 * @example +324 * var element = editor.getSelection().<b>getSelectedElement()</b>; +325 * alert( element.getName() ); +326 */ +327 getSelectedElement : function() +328 { +329 var node; +330 +331 if ( this.getType() == CKEDITOR.SELECTION_ELEMENT ) +332 { +333 var sel = this.getNative(); +334 +335 if ( CKEDITOR.env.ie ) +336 { +337 try +338 { +339 node = sel.createRange().item(0); +340 } +341 catch(e) {} +342 } +343 else +344 { +345 var range = sel.getRangeAt( 0 ); +346 node = range.startContainer.childNodes[ range.startOffset ]; +347 } +348 } +349 +350 return ( node ? new CKEDITOR.dom.element( node ) : null ); +351 }, +352 +353 selectElement : +354 CKEDITOR.env.ie ? +355 function( element ) +356 { +357 this.getNative().empty() ; +358 +359 var range ; +360 try +361 { +362 // Try to select the node as a control. +363 range = this.document.$.body.createControlRange() ; +364 range.addElement( element.$ ) ; +365 } +366 catch(e) +367 { +368 // If failed, select it as a text range. +369 range = this.document.$.body.createTextRange() ; +370 range.moveToElementText( element.$ ) ; +371 } +372 +373 range.select() ; +374 } +375 : +376 function( element ) +377 { +378 // Create the range for the element. +379 var range = this.document.$.createRange() ; +380 range.selectNode( element.$ ) ; +381 +382 // Select the range. +383 var sel = this.getNative() ; +384 sel.removeAllRanges() ; +385 sel.addRange( range ) ; +386 } +387 }; +388 })(); +389 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__sourcearea_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__sourcearea_plugin.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__sourcearea_plugin.js.html (revision 2278) @@ -36,59 +36,92 @@ 29 init : function( editor, pluginPath ) 30 { - 31 editor.on( 'editingBlockReady', function() - 32 { - 33 var textarea; - 34 - 35 editor.addMode( 'source', - 36 { - 37 load : function( holderElement, data ) - 38 { - 39 // Create the source area <textarea>. - 40 textarea = new CKEDITOR.dom.element( 'textarea' ); - 41 textarea.setAttribute( 'dir', 'ltr' ); - 42 textarea.addClass( 'cke_source' ); - 43 textarea.setStyles({ - 44 width : '100%', - 45 height : '100%', - 46 resize : 'none', - 47 outline : 'none', - 48 'text-align' : 'left' }); - 49 - 50 // Set the <textarea> value. - 51 this.loadData( data ); - 52 - 53 // Reset the holder element and append the - 54 // <textarea> to it. - 55 holderElement.setHtml( '' ); - 56 holderElement.append( textarea ); - 57 }, - 58 - 59 loadData : function( data ) - 60 { - 61 textarea.setValue( data ); - 62 }, - 63 - 64 getData : function() - 65 { - 66 return textarea.getValue(); - 67 }, - 68 - 69 getSnapshotData : function() - 70 { - 71 return textarea.getValue(); - 72 }, - 73 - 74 unload : function( holderElement ) - 75 { - 76 textarea = null; - 77 }, - 78 - 79 focus : function() - 80 { - 81 textarea.focus(); - 82 } - 83 }); - 84 }); - 85 } - 86 }); - 87 + 31 var sourcearea = CKEDITOR.plugins.sourcearea; + 32 + 33 editor.on( 'editingBlockReady', function() + 34 { + 35 var textarea; + 36 + 37 editor.addMode( 'source', + 38 { + 39 load : function( holderElement, data ) + 40 { + 41 // Create the source area <textarea>. + 42 textarea = new CKEDITOR.dom.element( 'textarea' ); + 43 textarea.setAttribute( 'dir', 'ltr' ); + 44 textarea.addClass( 'cke_source' ); + 45 textarea.setStyles({ + 46 width : '100%', + 47 height : '100%', + 48 resize : 'none', + 49 outline : 'none', + 50 'text-align' : 'left' }); + 51 + 52 // Set the <textarea> value. + 53 this.loadData( data ); + 54 + 55 // Reset the holder element and append the + 56 // <textarea> to it. + 57 holderElement.setHtml( '' ); + 58 holderElement.append( textarea ); + 59 }, + 60 + 61 loadData : function( data ) + 62 { + 63 textarea.setValue( data ); + 64 }, + 65 + 66 getData : function() + 67 { + 68 return textarea.getValue(); + 69 }, + 70 + 71 getSnapshotData : function() + 72 { + 73 return textarea.getValue(); + 74 }, + 75 + 76 unload : function( holderElement ) + 77 { + 78 textarea = null; + 79 }, + 80 + 81 focus : function() + 82 { + 83 textarea.focus(); + 84 } + 85 }); + 86 }); + 87 + 88 editor.addCommand( 'source', sourcearea.commands.source ); + 89 editor.ui.addButton( 'Source', sourcearea.ui.source ); + 90 } + 91 }); + 92 + 93 /** + 94 * Holds the definition of commands an UI elements included with the sourcearea + 95 * plugin. + 96 * @example + 97 */ + 98 CKEDITOR.plugins.sourcearea = + 99 { +100 commands : +101 { +102 source : +103 { +104 exec : function( editor ) +105 { +106 editor.setMode( editor.mode == 'source' ? 'wysiwyg' : 'source' ); +107 } +108 } +109 }, +110 +111 ui : +112 { +113 source : +114 { +115 label : 'Source', +116 command : 'source' +117 } +118 } +119 }; +120 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__toolbar_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__toolbar_plugin.js.html (revision 2277) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__toolbar_plugin.js.html (revision 2278) @@ -39,19 +39,79 @@ 32 { 33 if ( event.data.space == editor.config.toolbarLocation ) - 34 event.data.html += - 35 '<div>Toolbar!</div>'; - 36 }); - 37 } - 38 }); - 39 - 40 /** - 41 * The "theme space" to which rendering the toolbar. For the default theme, - 42 * the recommended options are "top" and "bottom". - 43 * @type String - 44 * @default 'top' - 45 * @see CKEDITOR.config.theme - 46 * @example - 47 * config.toolbarLocation = 'bottom'; - 48 */ - 49 CKEDITOR.config.toolbarLocation = 'top'; - 50 + 34 { + 35 var output = [ '<div class="cke_toolbox">' ]; + 36 + 37 var toolbar = editor.config.toolbar; + 38 + 39 for ( var r = 0 ; r < toolbar.length ; r++ ) + 40 { + 41 var row = toolbar[ r ]; + 42 + 43 output.push( '<div class="cke_toolbar">' ); + 44 + 45 for ( var i = 0 ; i < row.length ; i++ ) + 46 { + 47 var item, + 48 itemName = row[ i ]; + 49 + 50 if ( itemName == '-' ) + 51 item = CKEDITOR.ui.separator; + 52 else + 53 item = editor.ui.get( row[ i ] ); + 54 + 55 if ( item ) + 56 item.render( editor, output ); + 57 } + 58 + 59 output.push( '</div>' ); + 60 } + 61 + 62 output.push( '</div>' ); + 63 + 64 event.data.html += output.join( '' ); + 65 } + 66 }); + 67 } + 68 }); + 69 + 70 /** + 71 * The UI element that renders a toolbar separator. + 72 * @type Object + 73 * @example + 74 */ + 75 CKEDITOR.ui.separator = + 76 { + 77 render : function( editor, output ) + 78 { + 79 output.push( '<span class="cke_separator"></span>' ); + 80 } + 81 }; + 82 + 83 /** + 84 * The "theme space" to which rendering the toolbar. For the default theme, + 85 * the recommended options are "top" and "bottom". + 86 * @type String + 87 * @default 'top' + 88 * @see CKEDITOR.config.theme + 89 * @example + 90 * config.toolbarLocation = 'bottom'; + 91 */ + 92 CKEDITOR.config.toolbarLocation = 'top'; + 93 + 94 /** + 95 * The toolbox (alias toolbar) definition. It is an array of toolbars (strips), + 96 * each one being also an array, containing a list of UI items. + 97 * @type Array + 98 * @example + 99 * // Defines a toolbar with only one strip containing the "Source" button, a +100 * // separator and the "Bold" and "Italic" buttons. +101 * <b>CKEDITOR.config.toolbar = +102 * [ +103 * [ 'Source', '-', 'Bold', 'Italic' ] +104 * ]</b>; +105 */ +106 CKEDITOR.config.toolbar = +107 [ +108 [ 'Source', '-', 'Bold', 'Italic' ] +109 ]; +110 Index: /CKEditor/branches/prototype/_samples/sample01.html =================================================================== --- /CKEditor/branches/prototype/_samples/sample01.html (revision 2277) +++ /CKEditor/branches/prototype/_samples/sample01.html (revision 2278) @@ -34,9 +34,4 @@

    -
    - -

    -

    Index: /CKEditor/branches/prototype/_source/core/commandDefinition.js =================================================================== --- /CKEditor/branches/prototype/_source/core/commandDefinition.js (revision 2278) +++ /CKEditor/branches/prototype/_source/core/commandDefinition.js (revision 2278) @@ -0,0 +1,51 @@ +/* + * CKEditor - The text editor for Internet - http://ckeditor.com + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +/** + * @fileOverview Defines the "virtual" {@link CKEDITOR.commandDefinition} class, + * which contains the defintion of a command. This file is for + * documentation purposes only. + */ + +/** + * (Virtual Class) Do not call this constructor. This class is not really part + * of the API. It just illustrates the features of command objects to be + * passed to the {@link CKEDITOR.editor.prototype.addCommand} function. + * @name CKEDITOR.commandDefinition + * @constructor + * @example + */ + + /** + * Executes the command. + * @name CKEDITOR.commandDefinition.prototype.exec + * @function + * @param {CKEDITOR.editor} editor The editor within which run the command. + * @param {Object} [data] Additional data to be used to execute the command. + * @example + * editorInstance.addCommand( 'sample', + * { + * exec : function( editor ) + * { + * alert( 'Executing a command for the editor name "' + editor.name + '"!' ); + * } + * }); + */ Index: /CKEditor/branches/prototype/_source/core/config.js =================================================================== --- /CKEditor/branches/prototype/_source/core/config.js (revision 2277) +++ /CKEditor/branches/prototype/_source/core/config.js (revision 2278) @@ -136,5 +136,5 @@ * config.plugins = 'editingblock,toolbar,wysiwygarea'; */ - plugins : 'basicstyles,editingblock,elementspath,htmldataprocessor,selection,sourcearea,toolbar,wysiwygarea', + plugins : 'basicstyles,button,editingblock,elementspath,htmldataprocessor,selection,sourcearea,toolbar,wysiwygarea', /** Index: /CKEditor/branches/prototype/_source/core/dom/element.js =================================================================== --- /CKEditor/branches/prototype/_source/core/dom/element.js (revision 2277) +++ /CKEditor/branches/prototype/_source/core/dom/element.js (revision 2278) @@ -494,4 +494,50 @@ this.setStyle( name, stylesPairs[ name ] ); return this; - } + }, + + /** + * Makes the element unselectable. + * @function + * @example + * var element = CKEDITOR.dom.element.getById( 'myElement' ); + * element.unselectable(); + */ + unselectable : + CKEDITOR.env.gecko ? + function() + { + this.$.style.MozUserSelect = 'none'; + } + : CKEDITOR.env.webkit ? + function() + { + this.$.style.KhtmlUserSelect = 'none'; + } + : + function() + { + if ( CKEDITOR.env.ie || CKEDITOR.env.opera ) + { + var element = this.$, + e, + i = 0; + + element.unselectable = 'on'; + + while ( ( e = element.all[ i++ ] ) ) + { + switch ( e.tagName.toLowerCase() ) + { + case 'iframe' : + case 'textarea' : + case 'input' : + case 'select' : + /* Ignore the above tags */ + break; + default : + e.unselectable = 'on'; + } + } + } + } }); Index: /CKEditor/branches/prototype/_source/core/editor.js =================================================================== --- /CKEditor/branches/prototype/_source/core/editor.js (revision 2277) +++ /CKEditor/branches/prototype/_source/core/editor.js (revision 2278) @@ -148,11 +148,15 @@ editor.plugins = plugins; - // Initialize all plugins that have the "init" method defined. - for ( var i = 0 ; i < plugins.length ; i++ ) + // Initialize all plugins that have the "beforeInit" and "init" methods defined. + var methods = [ 'beforeInit', 'init' ]; + for ( var m = 0 ; m < methods.length ; m++ ) { - var pluginName = plugins[ i ]; - var plugin = CKEDITOR.plugins.get( pluginName ); - if ( plugin && plugin.init ) - plugin.init( editor, CKEDITOR.plugins.getPath( pluginName ) ); + for ( var i = 0 ; i < plugins.length ; i++ ) + { + var pluginName = plugins[ i ]; + var plugin = CKEDITOR.plugins.get( pluginName ); + if ( plugin && plugin[ methods[ m ] ] ) + plugin[ methods[ m ] ]( editor, CKEDITOR.plugins.getPath( pluginName ) ); + } } @@ -220,4 +224,12 @@ this.config = new config(); + /** + * Namespace containing UI features related to this editor instance. + * @name CKEDITOR.editor.prototype.ui + * @type CKEDITOR.ui + * @example + */ + this.ui = new CKEDITOR.ui( this ); + // Call initConfig using events, to be sure that instanceCreated is // fired first. @@ -231,4 +243,18 @@ CKEDITOR.editor.prototype = { + /** + * Adds a command definition to the editor instance. Commands added with + * this function can be later executed with {@link #execCommand}. + * @param {String} commandName The indentifier name of the command. + * @param {CKEDITOR.commandDefinition} commandDefinition The command definition. + * @example + * editorInstance.addCommand( 'sample', + * { + * exec : function( editor ) + * { + * alert( 'Executing a command for the editor name "' + editor.name + '"!' ); + * } + * }); + */ addCommand : function( commandName, commandDefinition ) { @@ -236,16 +262,18 @@ }, + /** + * Executes a command. + * @param {String} commandName The indentifier name of the command. + * @param {Object} [data] Data to be passed to the command + * @example + * editorInstance.execCommand( 'Bold' ); + */ execCommand : function( commandName, data ) { - var command = this.getCommand( commandName ); + var command = this._.commands[ commandName ]; if ( command ) - return command.exec( data ); + return command.exec( this, data ); throw 'Unknown command name "' + commandName + '"'; - }, - - getCommand : function( commandName ) - { - return this._.commands[ commandName ] || null; }, Index: /CKEditor/branches/prototype/_source/core/loader.js =================================================================== --- /CKEditor/branches/prototype/_source/core/loader.js (revision 2277) +++ /CKEditor/branches/prototype/_source/core/loader.js (revision 2278) @@ -54,5 +54,5 @@ 'core/dom/text' : [ 'core/dom/node', 'core/dom/domobject' ], 'core/dom/window' : [ 'core/dom/domobject' ], - 'core/editor' : [ 'core/config', 'core/event', 'core/plugins', 'core/skins', 'core/themes', 'core/tools' ], + 'core/editor' : [ 'core/config', 'core/event', 'core/plugins', 'core/skins', 'core/themes', 'core/tools', 'core/ui' ], 'core/env' : [], 'core/event' : [], @@ -63,4 +63,5 @@ 'core/themes' : [ 'lang/en', 'core/resourceManager' ], 'core/tools' : [ 'core/env' ], + 'core/ui' : [], 'core/xml' : [ 'core/env' ] }; Index: /CKEditor/branches/prototype/_source/core/pluginDefinition.js =================================================================== --- /CKEditor/branches/prototype/_source/core/pluginDefinition.js (revision 2277) +++ /CKEditor/branches/prototype/_source/core/pluginDefinition.js (revision 2278) @@ -27,11 +27,30 @@ /** - * This class is not really part of the API. It just illustrates the features - * of plugin objects to passed to the {@link CKEDITOR.plugins.add} function. + * (Virtual Class) Do not call this constructor. This class is not really part + * of the API. It just illustrates the features of plugin objects to be + * passed to the {@link CKEDITOR.plugins.add} function. * @name CKEDITOR.pluginDefinition * @constructor * @example - * // Do not do this. - * var myEvent = new CKEDITOR.pluginDefinition(); // Error: CKEDITOR.pluginDefinition is undefined + */ + + /** + * Function called on initialization of every editor instance created in the + * page before the init() call task. The beforeInit function will be called for + * all plugins, after that the init function is called for all of them. This + * feature makes it possible to initialize things that could be used in the + * init function of other plugins. + * @name CKEDITOR.pluginDefinition.prototype.beforeInit + * @function + * @param {CKEDITOR.editor} editor The editor instance being initialized. + * @param {String} pluginPath The URL path for the plugin installation folder. + * @example + * CKEDITOR.plugins.add( 'sample', + * { + * beforeInit : function( editor, pluginPath ) + * { + * alert( 'Editor "' + editor.name + '" is to be initialized!' ); + * } + * }); */ Index: /CKEditor/branches/prototype/_source/core/skins.js =================================================================== --- /CKEditor/branches/prototype/_source/core/skins.js (revision 2277) +++ /CKEditor/branches/prototype/_source/core/skins.js (revision 2278) @@ -60,5 +60,5 @@ { loadCss( CKEDITOR.getUrl( - '_source/' + // @Packager.RemoveLine + '_source/' + // TODO: Add @-Packager.RemoveLine to the final build process. 'skins/' + skinName + '/' + skinPart + '.css' ) ); } Index: /CKEditor/branches/prototype/_source/core/ui.js =================================================================== --- /CKEditor/branches/prototype/_source/core/ui.js (revision 2278) +++ /CKEditor/branches/prototype/_source/core/ui.js (revision 2278) @@ -0,0 +1,111 @@ +/* + * CKEditor - The text editor for Internet - http://ckeditor.com + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +/** + * Contains UI features related to an editor instance. + * @constructor + * @param {CKEDITOR.editor} editor The editor instance. + * @example + */ +CKEDITOR.ui = function( editor ) +{ + if ( editor.ui ) + return editor.ui; + + this._ = + { + handlers : {}, + items : {} + }; + + return this; +}; + +CKEDITOR.ui.prototype = +{ + /** + * Adds a UI item to the items collection. These items can be later used in + * the interface. + * @param {String} name The UI item name. + * @param {Object} type The item type. + * @param {Object} definition The item definition. The properties of this + * object depend on the item type. + * @example + * // Add a new button named "MyBold". + * editorInstance.ui.add( 'MyBold', CKEDITOR.UI_BUTTON, + * { + * label : 'My Bold', + * command : 'bold' + * }); + */ + add : function( name, type, definition ) + { + var item = this._.handlers[ type ].create( definition ); + item.name = name; + this._.items[ name ] = item; + }, + + /** + * Gets a UI object. + * @param {String} name The UI item hame. + * @example + */ + get : function( name ) + { + return this._.items[ name ] || null; + }, + + /** + * Adds a handler for a UI item type. The handler is responsible for + * transforming UI item definitions in UI objects. + * @param {Object} type The item type. + * @param {Object} handler The handler definition. + * @example + */ + addHandler : function( type, handler ) + { + this._.handlers[ type ] = handler; + } +}; + +/** + * (Virtual Class) Do not call this constructor. This class is not really part + * of the API. It just illustrates the features of hanlder objects to be + * passed to the {@link CKEDITOR.ui.prototype.addHandler} function. + * @name CKEDITOR.ui.handlerDefinition + * @constructor + * @example + */ + + /** + * Transforms an item definition into an UI item object. + * @name CKEDITOR.handlerDefinition.prototype.create + * @function + * @param {Object} definition The item definition. + * @example + * editorInstance.ui.addHandler( CKEDITOR.UI_BUTTON, + * { + * create : function( definition ) + * { + * return new CKEDITOR.ui.button( definition ); + * } + * }); + */ Index: /CKEditor/branches/prototype/_source/plugins/basicstyles/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/basicstyles/plugin.js (revision 2277) +++ /CKEditor/branches/prototype/_source/plugins/basicstyles/plugin.js (revision 2278) @@ -24,28 +24,60 @@ init : function( editor, pluginPath ) { - editor.addCommand( 'bold', - { - exec : function() - { - editor.focus(); + var basicstyles = CKEDITOR.plugins.basicstyles, + commands = basicstyles.commands, + ui = basicstyles.ui; - var doc = editor.document; - if ( doc ) - return doc.$.execCommand( 'bold', false, null ); - return false; - } - }); + editor.addCommand( 'bold', commands.bold ); + editor.addCommand( 'italic', commands.italic ); - editor.addCommand( 'italic', - { - exec : function() - { - editor.focus(); - var doc = editor.document; - if ( doc ) - return doc.$.execCommand( 'italic', false, null ); - return false; - } - }); + editor.ui.addButton( 'Bold', ui.bold ); + editor.ui.addButton( 'Italic', ui.italic ); } }); + +CKEDITOR.plugins.basicstyles = +{ + commands : + { + bold : + { + exec : function( editor ) + { + editor.focus(); + + var doc = editor.document; + if ( doc ) + return doc.$.execCommand( 'bold', false, null ); + return false; + } + }, + + italic : + { + exec : function( editor ) + { + editor.focus(); + + var doc = editor.document; + if ( doc ) + return doc.$.execCommand( 'italic', false, null ); + return false; + } + } + }, + + ui : + { + bold : + { + label : 'Bold', + command : 'bold' + }, + + italic : + { + label : 'Italic', + command : 'italic' + } + } +}; Index: /CKEditor/branches/prototype/_source/plugins/button/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/button/plugin.js (revision 2278) +++ /CKEditor/branches/prototype/_source/plugins/button/plugin.js (revision 2278) @@ -0,0 +1,151 @@ +/* + * CKEditor - The text editor for Internet - http://ckeditor.com + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +CKEDITOR.plugins.add( 'button', +{ + beforeInit : function( editor ) + { + editor.ui.addHandler( CKEDITOR.UI_BUTTON, CKEDITOR.ui.button.handler ); + } +}); + +/** + * Button UI element. + * @constant + * @example + */ +CKEDITOR.UI_BUTTON = 1; + +/** + * Represents a button UI element. This class should not be called directly. To + * create new buttons use {@link CKEDITOR.ui.prototype.addButton} instead. + * @constructor + * @param {Object} definition The button definition. + * @example + */ +CKEDITOR.ui.button = function( definition ) +{ + /** + * The button label. + * @name CKEDITOR.ui.button.prototype.label + * @type String + * @example + */ + this.label = definition.label; + + /** + * The command name associated to the button. If no command is defined, the + * "click" event is used. + * @name CKEDITOR.ui.button.prototype.command + * @type String + * @example + */ + this.command = definition.command; + + /** + * The button advisory title. It is usually displayed as the button tooltip. + * If not defined, the label is used. + * @name CKEDITOR.ui.button.prototype.title + * @type String + * @example + */ + this.title = definition.title || this.label; + + /** + * The function to be called when the user clicks the button. If not + * defined, the "command" property is required, and the command gets + * executed on click. + * @function + * @name CKEDITOR.ui.button.prototype.click + * @example + */ + this.click = definition.click || function( editor ) + { + editor.execCommand( definition.command ); + }; +}; + +/** + * Transforms a button definition in a {@link CKEDITOR.ui.button} instance. + * @type Object + * @example + */ +CKEDITOR.ui.button.handler = +{ + create : function( definition ) + { + return new CKEDITOR.ui.button( definition ); + } +}; + +CKEDITOR.ui.button.prototype = +{ + /** + * Renders the button. + * @param {CKEDITOR.editor} editor The editor instance which this button is + * to be used by. + * @param {Array} output The output array to which append the HTML relative + * to this button. + * @example + */ + render : function( editor, output ) + { + output.push( + '', + this.label, '' ); + } +}; + +/** + * Handles a button click. + * @private + */ +CKEDITOR.ui.button._ = +{ + click : function( instanceName, uiItemName, elementId ) + { + var editor = CKEDITOR.instances[ instanceName ]; + editor.focus(); + + var uiItem = editor.ui.get( uiItemName ).click( editor, elementId ); + + return false; + } +}; + +/** + * Adds a button definition to the UI elements list. + * @param {String} The button name. + * @param {Object} The button definition. + * @example + * editorInstance.ui.addButton( 'MyBold', + * { + * label : 'My Bold', + * command : 'bold' + * }); + */ +CKEDITOR.ui.prototype.addButton = function( name, definition ) +{ + this.add( name, CKEDITOR.UI_BUTTON, definition ); +}; Index: /CKEditor/branches/prototype/_source/plugins/elementspath/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/elementspath/plugin.js (revision 2277) +++ /CKEditor/branches/prototype/_source/plugins/elementspath/plugin.js (revision 2278) @@ -52,7 +52,8 @@ while ( element ) { - var index = elementsList.push( element ) - 1; - var name = element.getName(); - html.unshift( '', name, '' ); + var index = elementsList.push( element ) - 1, + name = element.getName(); + + html.unshift( '', name, '' ); if ( name == 'body' ) @@ -83,3 +84,5 @@ var element = editor._.elementsPathList[ elementIndex ]; editor.getSelection().selectElement( element ); + + return false; }; Index: /CKEditor/branches/prototype/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/selection/plugin.js (revision 2277) +++ /CKEditor/branches/prototype/_source/plugins/selection/plugin.js (revision 2278) @@ -195,17 +195,15 @@ * var selection = editor.getSelection().getNative(); */ - getNative : (function() - { - if ( CKEDITOR.env.ie ) - return function() - { - return this.document.$.selection; - }; - else - return function() - { - return this.document.getWindow().$.getSelection(); - }; - })(), + getNative : + CKEDITOR.env.ie ? + function() + { + return this.document.$.selection; + } + : + function() + { + return this.document.getWindow().$.getSelection(); + }, /** @@ -226,58 +224,56 @@ * alert( 'Text is selected' ); */ - getType : (function() - { - if ( CKEDITOR.env.ie ) - return function() - { - try + getType : + CKEDITOR.env.ie ? + function() + { + try + { + var sel = this.getNative(), + ieType = sel.type; + + if ( ieType == 'Text' ) + return CKEDITOR.SELECTION_TEXT; + + if ( ieType == 'Control' ) + return CKEDITOR.SELECTION_ELEMENT; + + // It is possible that we can still get a text range + // object even when type == 'None' is returned by IE. + // So we'd better check the object returned by + // createRange() rather than by looking at the type. + if ( sel.createRange().parentElement ) + return CKEDITOR.SELECTION_TEXT; + } + catch(e) {} + + return CKEDITOR.SELECTION_NONE; + } + : + function() + { + var sel = this.getNative(); + if ( !sel ) + return CKEDITOR.SELECTION_NONE; + + if ( sel.rangeCount == 1 ) + { + // Check if the actual selection is a control (IMG, + // TABLE, HR, etc...). + + var range = sel.getRangeAt(0), + startContainer = range.startContainer; + + if ( startContainer == range.endContainer + && startContainer.nodeType == 1 + && ( range.endOffset - range.startOffset ) == 1 + && styleObjectElements[ startContainer.childNodes[ range.startOffset ].nodeName.toLowerCase() ] ) { - var sel = this.getNative(), - ieType = sel.type; - - if ( ieType == 'Text' ) - return CKEDITOR.SELECTION_TEXT; - - if ( ieType == 'Control' ) - return CKEDITOR.SELECTION_ELEMENT; - - // It is possible that we can still get a text range - // object even when type == 'None' is returned by IE. - // So we'd better check the object returned by - // createRange() rather than by looking at the type. - if ( sel.createRange().parentElement ) - return CKEDITOR.SELECTION_TEXT; + return CKEDITOR.SELECTION_ELEMENT; } - catch(e) {} - - return CKEDITOR.SELECTION_NONE; - }; - else - return function() - { - var sel = this.getNative(); - if ( !sel ) - return CKEDITOR.SELECTION_NONE; - - if ( sel.rangeCount == 1 ) - { - // Check if the actual selection is a control (IMG, - // TABLE, HR, etc...). - - var range = sel.getRangeAt(0), - startContainer = range.startContainer; - - if ( startContainer == range.endContainer - && startContainer.nodeType == 1 - && ( range.endOffset - range.startOffset ) == 1 - && styleObjectElements[ startContainer.childNodes[ range.startOffset ].nodeName.toLowerCase() ] ) - { - return CKEDITOR.SELECTION_ELEMENT; - } - } - - return CKEDITOR.SELECTION_TEXT; - }; - })(), + } + + return CKEDITOR.SELECTION_TEXT; + }, /** @@ -355,44 +351,38 @@ }, - selectElement : (function() - { - if ( CKEDITOR.env.ie ) - { - return function( element ) - { - this.getNative().empty() ; - - var range ; - try - { - // Try to select the node as a control. - range = this.document.$.body.createControlRange() ; - range.addElement( element.$ ) ; - } - catch(e) - { - // If failed, select it as a text range. - range = this.document.$.body.createTextRange() ; - range.moveToElementText( element.$ ) ; - } - - range.select() ; - }; - } - else - { - return function( element ) - { - // Create the range for the element. - var range = this.document.$.createRange() ; - range.selectNode( element.$ ) ; - - // Select the range. - var sel = this.getNative() ; - sel.removeAllRanges() ; - sel.addRange( range ) ; - }; - } - })() + selectElement : + CKEDITOR.env.ie ? + function( element ) + { + this.getNative().empty() ; + + var range ; + try + { + // Try to select the node as a control. + range = this.document.$.body.createControlRange() ; + range.addElement( element.$ ) ; + } + catch(e) + { + // If failed, select it as a text range. + range = this.document.$.body.createTextRange() ; + range.moveToElementText( element.$ ) ; + } + + range.select() ; + } + : + function( element ) + { + // Create the range for the element. + var range = this.document.$.createRange() ; + range.selectNode( element.$ ) ; + + // Select the range. + var sel = this.getNative() ; + sel.removeAllRanges() ; + sel.addRange( range ) ; + } }; })(); Index: /CKEditor/branches/prototype/_source/plugins/sourcearea/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/sourcearea/plugin.js (revision 2277) +++ /CKEditor/branches/prototype/_source/plugins/sourcearea/plugin.js (revision 2278) @@ -29,4 +29,6 @@ init : function( editor, pluginPath ) { + var sourcearea = CKEDITOR.plugins.sourcearea; + editor.on( 'editingBlockReady', function() { @@ -83,4 +85,35 @@ }); }); + + editor.addCommand( 'source', sourcearea.commands.source ); + editor.ui.addButton( 'Source', sourcearea.ui.source ); } }); + +/** + * Holds the definition of commands an UI elements included with the sourcearea + * plugin. + * @example + */ +CKEDITOR.plugins.sourcearea = +{ + commands : + { + source : + { + exec : function( editor ) + { + editor.setMode( editor.mode == 'source' ? 'wysiwyg' : 'source' ); + } + } + }, + + ui : + { + source : + { + label : 'Source', + command : 'source' + } + } +}; Index: /CKEditor/branches/prototype/_source/plugins/toolbar/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/toolbar/plugin.js (revision 2277) +++ /CKEditor/branches/prototype/_source/plugins/toolbar/plugin.js (revision 2278) @@ -32,9 +32,52 @@ { if ( event.data.space == editor.config.toolbarLocation ) - event.data.html += - '
    Toolbar!
    '; + { + var output = [ '
    ' ]; + + var toolbar = editor.config.toolbar; + + for ( var r = 0 ; r < toolbar.length ; r++ ) + { + var row = toolbar[ r ]; + + output.push( '
    ' ); + + for ( var i = 0 ; i < row.length ; i++ ) + { + var item, + itemName = row[ i ]; + + if ( itemName == '-' ) + item = CKEDITOR.ui.separator; + else + item = editor.ui.get( row[ i ] ); + + if ( item ) + item.render( editor, output ); + } + + output.push( '
    ' ); + } + + output.push( '
    ' ); + + event.data.html += output.join( '' ); + } }); } }); + +/** + * The UI element that renders a toolbar separator. + * @type Object + * @example + */ +CKEDITOR.ui.separator = +{ + render : function( editor, output ) + { + output.push( '' ); + } +}; /** @@ -48,2 +91,19 @@ */ CKEDITOR.config.toolbarLocation = 'top'; + +/** + * The toolbox (alias toolbar) definition. It is an array of toolbars (strips), + * each one being also an array, containing a list of UI items. + * @type Array + * @example + * // Defines a toolbar with only one strip containing the "Source" button, a + * // separator and the "Bold" and "Italic" buttons. + * CKEDITOR.config.toolbar = + * [ + * [ 'Source', '-', 'Bold', 'Italic' ] + * ]; + */ +CKEDITOR.config.toolbar = +[ + [ 'Source', '-', 'Bold', 'Italic' ] +]; Index: /CKEditor/branches/prototype/_source/skins/default/editor.css =================================================================== --- /CKEditor/branches/prototype/_source/skins/default/editor.css (revision 2277) +++ /CKEditor/branches/prototype/_source/skins/default/editor.css (revision 2278) @@ -22,2 +22,3 @@ @import url("reset.css"); @import url("mainui.css"); +@import url("toolbar.css"); Index: /CKEditor/branches/prototype/_source/skins/default/mainui.css =================================================================== --- /CKEditor/branches/prototype/_source/skins/default/mainui.css (revision 2277) +++ /CKEditor/branches/prototype/_source/skins/default/mainui.css (revision 2278) @@ -31,5 +31,4 @@ } - . .cke_skin_default.cke_focus { Index: /CKEditor/branches/prototype/_source/skins/default/toolbar.css =================================================================== --- /CKEditor/branches/prototype/_source/skins/default/toolbar.css (revision 2278) +++ /CKEditor/branches/prototype/_source/skins/default/toolbar.css (revision 2278) @@ -0,0 +1,49 @@ +/* + * CKEditor - The text editor for Internet - http://ckeditor.com + * Copyright (C) 2003-2008 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +.cke_skin_default .cke_toolbar +{ + padding: 5px; +} + +.cke_skin_default .cke_separator +{ + border-left: solid 1px #999; + margin-left: 2px; + margin-right:2px; +} + +.cke_skin_default a.cke_button +{ + border: solid 1px #bbb; + background-color: #eee; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 4px; + padding-right: 4px; + margin-left: 2px; + margin-right: 2px; +} + +.cke_skin_default a:hover.cke_button +{ + background-color: #fff; +} Index: /CKEditor/branches/prototype/_source/themes/default/theme.js =================================================================== --- /CKEditor/branches/prototype/_source/themes/default/theme.js (revision 2277) +++ /CKEditor/branches/prototype/_source/themes/default/theme.js (revision 2278) @@ -60,4 +60,6 @@ '' ].join('') ); + container.unselectable(); + container.insertAfter( editor.element ); Index: /CKEditor/branches/prototype/fckpackager.xml =================================================================== --- /CKEditor/branches/prototype/fckpackager.xml (revision 2277) +++ /CKEditor/branches/prototype/fckpackager.xml (revision 2278) @@ -45,4 +45,5 @@ + @@ -79,4 +80,5 @@ + @@ -84,4 +86,5 @@ +