Index: /CKEditor/branches/prototype/_docs/api/files.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/files.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/files.html (revision 2100) @@ -207,4 +207,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -212,4 +216,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -259,4 +265,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -451,4 +469,28 @@
    +

    ../../_source/core/\plugins.js

    + +
    + + + + +
    +
    +
    + +
    +

    ../../_source/core/\resourcemanager.js

    + +
    + + + + +
    +
    +
    + +

    ../../_source/core/\scriptloader.js

    @@ -475,4 +517,16 @@
    +

    ../../_source/core/\themes.js

    + +
    + + + + +
    +
    +
    + +

    ../../_source/core/\tools.js

    @@ -487,5 +541,5 @@
    -

    ../../_source/plugins/\themes\default.js

    +

    ../../_source/plugins/\sample\plugin.js

    @@ -502,5 +556,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/index.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/index.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/index.html (revision 2100) @@ -207,4 +207,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -212,4 +216,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -259,4 +265,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -358,4 +376,20 @@
    +

    CKEDITOR.plugins

    + +Manages plugins registration and loading. +
    + + + +
    +

    CKEDITOR.resourceManager

    + +Base class for resource managers, like plugins and themes. +
    + + + +

    CKEDITOR.scriptLoader

    @@ -382,4 +416,12 @@
    +

    CKEDITOR.themes

    + +Manages themes registration and loading. +
    + + + +

    CKEDITOR.tools

    @@ -436,4 +478,10 @@
    + + + + + + @@ -460,5 +508,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ajax.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ajax.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.ajax.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -578,5 +596,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.config.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.config.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.config.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -518,5 +536,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -457,4 +475,22 @@   +
    insertAfter(element) +
    +
    NO DOCUMENTATION AVAILABLE
    + + + + +   + +
    insertBefore(element) +
    +
    NO DOCUMENTATION AVAILABLE
    + + + + +   +
    setAttribute(attributeName, value)
    @@ -467,4 +503,13 @@
    setAttributes(attributesPairs) +
    +
    NO DOCUMENTATION AVAILABLE
    + + + + +   + +
    setHtml(html)
    NO DOCUMENTATION AVAILABLE
    @@ -918,4 +963,96 @@
    + +
    + + + insertAfter(element) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + element + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    +
    + + + + + + +
    + + +
    + + + insertBefore(element) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + element + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    +
    @@ -1016,4 +1153,50 @@
    + +
    + + + setHtml(html) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + html + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    +
    @@ -1157,5 +1340,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -397,5 +415,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -553,5 +571,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -718,5 +736,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -750,5 +768,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -739,5 +757,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -420,4 +438,13 @@ <static>   +
    CKEDITOR.add(editor) +
    +
    NO DOCUMENTATION AVAILABLE
    + + + + + <static>   +
    CKEDITOR.appendTo(element, config)
    @@ -430,4 +457,13 @@
    CKEDITOR.create(instanceName, config) +
    +
    NO DOCUMENTATION AVAILABLE
    + + + + + <static>   + +
    CKEDITOR.loadFullCore()
    NO DOCUMENTATION AVAILABLE
    @@ -637,4 +673,5 @@
  • unloaded: the API is not yet loaded.
  • basic_loaded: the basic API features are available.
    • +
  • basic_ready: the basic API is ready to load the full core code.
  • loading: the full API is being loaded.
  • ready: the API can be fully used.
    • @@ -672,4 +709,53 @@ Method Detail
    + + +
    <static> + + + CKEDITOR.add(editor) + +
    +
    + NO DOCUMENTATION AVAILABLE + +
    + Defined in: ckeditor.js. + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + editor + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    @@ -767,4 +853,42 @@ + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    + + +
    <static> + + + CKEDITOR.loadFullCore() + +
    +
    + NO DOCUMENTATION AVAILABLE + +
    + Defined in: ckeditor_basic.js. + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + @@ -906,5 +1030,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -539,5 +557,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html (revision 2100) @@ -0,0 +1,431 @@ + + + + + + + JsDoc Reference - CKEDITOR.plugins + + + + + + + + + + + +
    + + +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Namespace CKEDITOR.plugins +

    + + +

    +
    Extends + CKEDITOR.resourceManager.
    + + + +Manages plugins registration and loading. + + +
    Defined in: plugins.js. + +

    + + + + + + + + + + + + + + + + + +
    Namespace Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.plugins +
    +
    Manages plugins registration and loading.
    +
    + + + + + + + + + + + +
    +
    Methods borrowed from class CKEDITOR.resourceManager:
    add, get, getPath, import, load
    +
    + + + + + +
    +
    + Namespace Detail +
    + +
    + CKEDITOR.plugins +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Manages plugins registration and loading. + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST) +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html (revision 2100) @@ -0,0 +1,759 @@ + + + + + + + JsDoc Reference - CKEDITOR.resourceManager + + + + + + + + + + + +
    + + +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Function Namespace CKEDITOR.resourceManager +

    + + +

    + + + +Base class for resource managers, like plugins and themes. + + +
    Defined in: resourcemanager.js. + +

    + + + + + + + + + + + + + + + + + +
    Function Namespace Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.resourceManager(basePath, fileName) +
    +
    Base class for resource managers, like plugins and themes.
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Method Summary
    Method AttributesMethod Name and Description
      +
    add(name, definition) +
    +
    NO DOCUMENTATION AVAILABLE
    +
      +
    get(name) +
    +
    NO DOCUMENTATION AVAILABLE
    +
      +
    getPath(name) +
    +
    NO DOCUMENTATION AVAILABLE
    +
      +
    import(name, path) +
    +
    NO DOCUMENTATION AVAILABLE
    +
      +
    load(name, callback, scope) +
    +
    Loads one or more items.
    +
    + + + + + + + +
    +
    + Function Namespace Detail +
    + +
    + CKEDITOR.resourceManager(basePath, fileName) +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Base class for resource managers, like plugins and themes. + +
    + + + + + + + + + +
    +
    Parameters:
    + +
    + basePath + +
    +
    + +
    + fileName + +
    +
    + +
    + + + + + + + +
    + + + + + + + +
    + Method Detail +
    + + +
    + + + add(name, definition) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + name + +
    +
    + +
    + definition + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    + + +
    + + + get(name) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + name + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    + + +
    + + + getPath(name) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + name + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    + + +
    + + + import(name, path) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + name + +
    +
    + +
    + path + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + +
    + + +
    + + + load(name, callback, scope) + +
    +
    + Loads one or more items. + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + {String|Array} name + +
    +
    The name of the item to load.
    + +
    + {Function} callback + +
    +
    A function to be called when all plugins are loaded.
    + +
    + {Object} scope + Optional +
    +
    The scope object to be used for the callback call.
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST) +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -548,5 +566,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.assert.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.assert.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.assert.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -399,5 +417,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -483,5 +501,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html (revision 2100) @@ -0,0 +1,431 @@ + + + + + + + JsDoc Reference - CKEDITOR.themes + + + + + + + + + + + +
    + + +
    +

    Namespaces

    + +

    Classes

    + +
    + +
    + +
    + +

    + + Namespace CKEDITOR.themes +

    + + +

    +
    Extends + CKEDITOR.resourceManager.
    + + + +Manages themes registration and loading. + + +
    Defined in: themes.js. + +

    + + + + + + + + + + + + + + + + + +
    Namespace Summary
    Constructor AttributesConstructor Name and Description
      +
    + CKEDITOR.themes +
    +
    Manages themes registration and loading.
    +
    + + + + + + + + + + + +
    +
    Methods borrowed from class CKEDITOR.resourceManager:
    add, get, getPath, import, load
    +
    + + + + + +
    +
    + Namespace Detail +
    + +
    + CKEDITOR.themes +
    + + +
    + Since: + 3.0 +
    + +
    + +
    + Manages themes registration and loading. + +
    + + + + + + + + + + + + + + + +
    + + + + + + + + +
    +
    + + +
    + + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST) +
    + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -382,4 +400,13 @@ + + <static>   + +
    CKEDITOR.tools.isArray(object) +
    +
    NO DOCUMENTATION AVAILABLE
    + + + @@ -639,4 +666,50 @@ +
    + + +
    <static> + + + CKEDITOR.tools.isArray(object) + +
    +
    + NO DOCUMENTATION AVAILABLE + + +
    + + + + 
    NO EXAMPLE AVAILABLE
    + + + + +
    +
    Parameters:
    + +
    + object + +
    +
    + +
    + + + +
    +
    Since:
    +
    3.0
    +
    + + + + + + + @@ -649,5 +722,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -718,5 +736,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:10 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/_global_.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/_global_.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/_global_.html (revision 2100) @@ -212,4 +212,8 @@
  • CKEDITOR.loader
    • +
  • CKEDITOR.plugins
    • + +
  • CKEDITOR.resourceManager
    • +
  • CKEDITOR.scriptLoader
    • @@ -217,4 +221,6 @@
  • CKEDITOR.test.assert
    • + +
  • CKEDITOR.themes
  • CKEDITOR.tools
    • @@ -264,4 +270,16 @@
  • CKEDITOR.eventInfo +
    • + +
  • + +
    • + +
  • + +
    • + +
  • +
    • @@ -335,5 +353,5 @@
    - Documentation generated by JsDoc Toolkit 2.0.1 on Wed Jun 18 2008 00:23:53 GMT+0200 (CEST) + Documentation generated by JsDoc Toolkit 2.0.1 on Sun Jun 22 2008 00:00:09 GMT+0200 (CEST)
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core___bootstrap.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core___bootstrap.js.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core___bootstrap.js.html (revision 2100) @@ -27,16 +27,20 @@ 20 */ 21 - 22 (function() - 23 { - 24 // Process all pending replacements. - 25 var pending = CKEDITOR.replace._pending; - 26 if ( pending ) - 27 { - 28 delete CKEDITOR.replace._pending; - 29 - 30 CKEDITOR.tools.each( pending, function() - 31 { - 32 CKEDITOR.replace( this[0], this[1] ); - 33 } ); - 34 } - 35 })(); + 22 // Load core plugins. + 23 CKEDITOR.plugins.load( CKEDITOR.config.corePlugins.split( ',' ), function() + 24 { + 25 // Process all pending <textarea> replacements. + 26 var pending = CKEDITOR.replace._pending; + 27 if ( pending ) + 28 { + 29 delete CKEDITOR.replace._pending; + 30 + 31 CKEDITOR.tools.each( pending, function( replaceInfo ) + 32 { + 33 // replaceInfo[0] == <textarea> DOM element + 34 // replaceInfo[1] == in-page configurations object + 35 CKEDITOR.replace( replaceInfo[0], replaceInfo[1] ); + 36 } ); + 37 } + 38 }); + 39 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor.js.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor.js.html (revision 2100) @@ -27,102 +27,39 @@ 20 */ 21 - 22 CKEDITOR.instances = {}; - 23 - 24 (function() - 25 { - 26 // These function loads custom configuration files and cache the - 27 // CKEDITOR.editorConfig functions defined on them, so there is no need to - 28 // download them more than once for several instances. - 29 var loadConfigLoaded = {}; - 30 var loadConfig = function( editor ) - 31 { - 32 var customConfig = editor.config.customConfig; + 22 // Remove the CKEDITOR.loadFullCore reference defined on ckeditor_basic. + 23 delete CKEDITOR.loadFullCore; + 24 + 25 CKEDITOR.instances = {}; + 26 + 27 // Overwrite the basic _replaceElement implementation with the definitive one. + 28 CKEDITOR.replace._replaceElement = function( textarea, config ) + 29 { + 30 // Encapsulates the original DOM textarea in a CKEDITOR.dom.element + 31 // instance. + 32 textarea = new CKEDITOR.dom.element( textarea ); 33 - 34 // Check if there is a custom config to load. - 35 if ( !customConfig ) - 36 return false; + 34 // Create the editor instance. + 35 CKEDITOR.add( new CKEDITOR.editor( textarea, config ) ); + 36 }; 37 - 38 var loadedConfig = loadConfigLoaded[ customConfig ] || ( loadConfigLoaded[ customConfig ] = { editors : [] } ); - 39 - 40 // If the custom config has already been downloaded, reuse it. - 41 if ( loadedConfig.fn ) - 42 { - 43 // Call the cached CKEDITOR.editorConfig defined in the custom - 44 // config file for the editor instance depending on it. - 45 loadedConfig.fn.call( editor, editor ); - 46 - 47 // If there is no other customConfig in the chain, fire the - 48 // "configloaded" event. - 49 if ( editor.config.customConfig == customConfig || !loadConfig( editor ) ) - 50 editor.fireOnce( 'configloaded' ); - 51 } - 52 else - 53 { - 54 // Add the editor to the list of editors waiting for this config. - 55 loadedConfig.editors.push( editor ); - 56 - 57 // Load the custom configuration file. - 58 CKEDITOR.scriptLoader.load( customConfig, function() - 59 { - 60 // If the CKEDITOR.editorConfig function has been properly - 61 // defined in the custom configuration file, cache it. - 62 if ( CKEDITOR.editorConfig ) - 63 loadedConfig.fn = CKEDITOR.editorConfig; - 64 else - 65 loadedConfig.fn = function(){}; - 66 - 67 delete CKEDITOR.editorConfig; - 68 - 69 CKEDITOR.tools.each( loadedConfig.editors, function( editor ) - 70 { - 71 // Call the load config again. This time the custom - 72 // config is already cached and so it will get loaded. - 73 loadConfig( editor ); - 74 }); - 75 - 76 delete loadedConfig.editors; - 77 } ); - 78 } - 79 - 80 return true; - 81 }; - 82 - 83 // Overwrite the basic _replaceElement implementation with the definitive one. - 84 CKEDITOR.replace._replaceElement = function( textarea, config ) - 85 { - 86 var textarea = new CKEDITOR.dom.element( textarea ); - 87 textarea.hide(); - 88 - 89 // Create the editor instance. - 90 var editor = new CKEDITOR.editor( textarea ); - 91 CKEDITOR.instances[ editor.name ] = editor; - 92 - 93 // Setup the lister for the "configloaded" event. - 94 editor.on( 'configloaded', function() - 95 { - 96 // Overwrite the settings from the in-page config. - 97 if ( config ) - 98 CKEDITOR.tools.extend( editor.config, config, true ); - 99 -100 // Fire the "instancecreated" event. -101 CKEDITOR.fire( 'instancecreated', editor.name, editor ); -102 }); -103 -104 // The instance config may override the customConfig setting to avoid -105 // loading the default ~/config.js file. -106 if ( config && config.customConfig != undefined ) -107 editor.config.customConfig = config.customConfig; -108 -109 // Load configs from the custom configuration files. -110 if ( !loadConfig( editor ) ) -111 editor.fireOnce( 'configloaded' ); -112 }; -113 })(); -114 -115 // Set the status to "loading", which means that the main CKEDITOR object has -116 // been created, and the rest is getting loaded. -117 CKEDITOR.status = 'loading'; -118 -119 // Load the bootstrap script. -120 CKEDITOR.loader.load( 'core/_bootstrap' ); -121 + 38 CKEDITOR.add = function( editor ) + 39 { + 40 var name = editor.name; + 41 + 42 // Abort it there is already an instance with that name. + 43 if ( CKEDITOR.instances[ name ] ) + 44 return; + 45 + 46 CKEDITOR.instances[ name ] = editor; + 47 + 48 CKEDITOR.fire( 'instancecreated', name, editor ); + 49 editor.fireOnce( 'instancecreated' ); + 50 }; + 51 + 52 // Set the status to "loading", which means that the main CKEDITOR object has + 53 // been created, and the rest is getting loaded. + 54 CKEDITOR.status = 'loading'; + 55 + 56 // Load the bootstrap script. + 57 CKEDITOR.loader.load( 'core/_bootstrap' ); + 58 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor_base.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor_base.js.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor_base.js.html (revision 2100) @@ -53,59 +53,60 @@ 46 * <li><b>unloaded</b>: the API is not yet loaded.</li> 47 * <li><b>basic_loaded</b>: the basic API features are available.</li> - 48 * <li><b>loading</b>: the full API is being loaded.</li> - 49 * <li><b>ready</b>: the API can be fully used.</li> - 50 * </ul> - 51 * @type string - 52 * @example - 53 * if ( <b>CKEDITOR.status</b> == 'ready' ) - 54 * { - 55 * // The API can now be fully used. - 56 * } - 57 */ - 58 status : 'unloaded', - 59 - 60 /** - 61 * Contains the full URL for the CKEditor installation directory. - 62 * @type string - 63 * @example - 64 * // Alerts "http://www.example.com/ckeditor/" (e.g.) - 65 * alert( <b>CKEDITOR.basePath</b> ); - 66 */ - 67 basePath : (function() - 68 { - 69 // ATTENTION: fixes on this code must be ported to - 70 // loader.basePath (core/loader.js). - 71 - 72 // Find out the editor directory path, based on its <script> tag. - 73 var path = ''; - 74 var scripts = document.getElementsByTagName( 'script' ); - 75 - 76 for ( var i = 0 ; i < scripts.length ; i++ ) - 77 { - 78 var match = scripts[i].src.match( /(^|.*[\\\/])ckeditor(?:_basic)?.js(?:\?.*)?$/i ); - 79 - 80 if ( match ) - 81 { - 82 path = match[1]; - 83 break; - 84 } - 85 } - 86 - 87 // In IE (only) the script.src string is the raw valued entered in the - 88 // HTML. Other browsers return the full resolved URL instead. - 89 if ( path.indexOf('://') == -1 ) - 90 { - 91 // Absolute path. - 92 if ( path.indexOf( '/' ) == 0 ) - 93 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; - 94 // Relative path. - 95 else - 96 path = location.href.match( /^[^\?]*\// )[0] + path; - 97 } - 98 - 99 return path; -100 })() -101 }; -102 })(); -103 } -104 + 48 * <li><b>basic_ready</b>: the basic API is ready to load the full core code.</li> + 49 * <li><b>loading</b>: the full API is being loaded.</li> + 50 * <li><b>ready</b>: the API can be fully used.</li> + 51 * </ul> + 52 * @type string + 53 * @example + 54 * if ( <b>CKEDITOR.status</b> == 'ready' ) + 55 * { + 56 * // The API can now be fully used. + 57 * } + 58 */ + 59 status : 'unloaded', + 60 + 61 /** + 62 * Contains the full URL for the CKEditor installation directory. + 63 * @type string + 64 * @example + 65 * // Alerts "http://www.example.com/ckeditor/" (e.g.) + 66 * alert( <b>CKEDITOR.basePath</b> ); + 67 */ + 68 basePath : (function() + 69 { + 70 // ATTENTION: fixes on this code must be ported to + 71 // loader.basePath (core/loader.js). + 72 + 73 // Find out the editor directory path, based on its <script> tag. + 74 var path = ''; + 75 var scripts = document.getElementsByTagName( 'script' ); + 76 + 77 for ( var i = 0 ; i < scripts.length ; i++ ) + 78 { + 79 var match = scripts[i].src.match( /(^|.*[\\\/])ckeditor(?:_basic)?.js(?:\?.*)?$/i ); + 80 + 81 if ( match ) + 82 { + 83 path = match[1]; + 84 break; + 85 } + 86 } + 87 + 88 // In IE (only) the script.src string is the raw valued entered in the + 89 // HTML. Other browsers return the full resolved URL instead. + 90 if ( path.indexOf('://') == -1 ) + 91 { + 92 // Absolute path. + 93 if ( path.indexOf( '/' ) == 0 ) + 94 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; + 95 // Relative path. + 96 else + 97 path = location.href.match( /^[^\?]*\// )[0] + path; + 98 } + 99 +100 return path; +101 })() +102 }; +103 })(); +104 } +105 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor_basic.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor_basic.js.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__ckeditor_basic.js.html (revision 2100) @@ -29,167 +29,187 @@ 22 CKEDITOR.event.implementOn( CKEDITOR ); 23 - 24 /** - 25 * The class name used to identify <textarea> elements to be replace - 26 * by CKEditor instances. - 27 * @type string - 28 * @default 'ckeditor' - 29 * @example - 30 * CKEDITOR.replaceClass = 'rich_editor'; - 31 */ - 32 CKEDITOR.replaceClass = 'ckeditor'; - 33 - 34 /** - 35 * Indicates that CKEditor will attempty to replace all textareas with - 36 * class name matching {@link CKEDITOR.replaceClass}. - 37 * @type Boolean - 38 * @default true - 39 * @example - 40 * // Disable the auto-replace feature. - 41 * CKEDITOR.replaceByClassEnabled = false; + 24 CKEDITOR.loadFullCore = function() + 25 { + 26 delete CKEDITOR.loadFullCore; + 27 + 28 var script = document.createElement( 'script' ); + 29 script.type = 'text/javascript'; + 30 script.src = CKEDITOR.basePath + 'ckeditor.js'; + 31 + 32 document.getElementsByTagName( 'head' )[0].appendChild( script ); + 33 }; + 34 + 35 /** + 36 * The class name used to identify <textarea> elements to be replace + 37 * by CKEditor instances. + 38 * @type string + 39 * @default 'ckeditor' + 40 * @example + 41 * CKEDITOR.replaceClass = 'rich_editor'; 42 */ - 43 CKEDITOR.replaceByClassEnabled = true; + 43 CKEDITOR.replaceClass = 'ckeditor'; 44 - 45 /** - 46 * Replaces a specific <textarea> with a CKEditor instance. - 47 * @param {object|string} elementOrIdOrName The DOM element (textarea), its - 48 * ID or name. - 49 * @param {Object} [config] The specific configurations to apply to this - 50 * editor instance. Configurations set here will override global CKEditor - 51 * settings. - 52 * @type undefined - 53 * @example - 54 * <textarea id="myfield" name="myfield"><:/textarea> - 55 * ... - 56 * <b>CKEDITOR.replace( 'myfield' )</b>; - 57 * @example - 58 * var textarea = document.body.appendChild( document.createElement( 'textarea' ) ); - 59 * <b>CKEDITOR.replace( textarea )</b>; - 60 */ - 61 CKEDITOR.replace = function( elementOrIdOrName, config ) - 62 { - 63 if ( CKEDITOR.env.isCompatible ) - 64 { - 65 var textarea = elementOrIdOrName; - 66 - 67 if ( typeof textarea != 'object' ) - 68 { - 69 // First look for the element id, then the name. - 70 var i = 0; - 71 var textareasByName = document.getElementsByName( elementOrIdOrName ); - 72 textarea = document.getElementById( elementOrIdOrName ) || textareasByName[ i++ ]; - 73 - 74 while ( textarea ) - 75 { - 76 if ( textarea.tagName.toLowerCase() == 'textarea' ) - 77 break; - 78 textarea = textareasByName[ i++ ]; - 79 } - 80 - 81 if ( !textarea ) - 82 { - 83 alert( '[CKEDITOR.replace] The <textarea> with id or name "' + elementOrIdOrName + '" was not found' ); - 84 return; - 85 } - 86 } - 87 - 88 CKEDITOR.replace._replaceElement( textarea, config ); - 89 } - 90 }; + 45 /** + 46 * Indicates that CKEditor will attempty to replace all textareas with + 47 * class name matching {@link CKEDITOR.replaceClass}. + 48 * @type Boolean + 49 * @default true + 50 * @example + 51 * // Disable the auto-replace feature. + 52 * CKEDITOR.replaceByClassEnabled = false; + 53 */ + 54 CKEDITOR.replaceByClassEnabled = true; + 55 + 56 /** + 57 * Replaces a specific <textarea> with a CKEditor instance. + 58 * @param {object|string} elementOrIdOrName The DOM element (textarea), its + 59 * ID or name. + 60 * @param {Object} [config] The specific configurations to apply to this + 61 * editor instance. Configurations set here will override global CKEditor + 62 * settings. + 63 * @type undefined + 64 * @example + 65 * <textarea id="myfield" name="myfield"><:/textarea> + 66 * ... + 67 * <b>CKEDITOR.replace( 'myfield' )</b>; + 68 * @example + 69 * var textarea = document.body.appendChild( document.createElement( 'textarea' ) ); + 70 * <b>CKEDITOR.replace( textarea )</b>; + 71 */ + 72 CKEDITOR.replace = function( elementOrIdOrName, config ) + 73 { + 74 if ( CKEDITOR.env.isCompatible ) + 75 { + 76 var textarea = elementOrIdOrName; + 77 + 78 if ( typeof textarea != 'object' ) + 79 { + 80 // First look for the element id, then the name. + 81 var i = 0; + 82 var textareasByName = document.getElementsByName( elementOrIdOrName ); + 83 textarea = document.getElementById( elementOrIdOrName ) || textareasByName[ i++ ]; + 84 + 85 while ( textarea ) + 86 { + 87 if ( textarea.tagName.toLowerCase() == 'textarea' ) + 88 break; + 89 textarea = textareasByName[ i++ ]; + 90 } 91 - 92 // This function will be overwritten by the fill core code implementation. - 93 CKEDITOR.replace._replaceElement = function( textarea, config ) - 94 { - 95 // Do not replace the textarea right now, just hide it. the - 96 // effective replacement will be done by the full core code. - 97 textarea.style.visibility = 'hidden'; + 92 if ( !textarea ) + 93 { + 94 throw '[CKEDITOR.replace] The <textarea> with id or name "' + elementOrIdOrName + '" was not found.'; + 95 return; + 96 } + 97 } 98 - 99 // Push the textarea in the array of pending replacements. -100 var pending = CKEDITOR.replace._pending || ( CKEDITOR.replace._pending = [] ); -101 pending.push( [ textarea, config ] ); -102 }; -103 -104 /** -105 * Replace all <textarea> elements available in the document with -106 * editor instances. -107 * @type undefined -108 * @example -109 * // Replace all <textarea> elements in the page. -110 * CKEDITOR.replaceAll(); -111 * @example -112 * // Replace all <textarea class="myClassName"> elements in the page. -113 * CKEDITOR.replaceAll( 'myClassName' ); -114 * @example -115 * // Selectively replace <textarea> elements, based on custom assertions. -116 * CKEDITOR.replaceAll( function( textarea, config ) -117 * { -118 * // Custom code to evaluate the replace, returning false -119 * // if it must not be done. -120 * // It also passes the "config" parameter, so the -121 * // developer can customize the instance. -122 * } ); -123 */ -124 CKEDITOR.replaceAll = function() -125 { -126 var textareas = document.getElementsByTagName( 'textarea' ); -127 -128 for ( var i = 0 ; i < textareas.length ; i++ ) -129 { -130 var config = null; -131 var textarea = textareas[i]; -132 var name = textarea.name; -133 -134 // The "name" attribute must exist. -135 if ( !name || name.length == 0 ) -136 continue; -137 -138 if ( typeof arguments[0] == 'string' ) -139 { -140 // The textarea class name could be passed as the function -141 // parameter. + 99 CKEDITOR.replace._replaceElement( textarea, config ); +100 } +101 }; +102 +103 // This function will be overwritten by the full core code implementation. +104 CKEDITOR.replace._replaceElement = function( textarea, config ) +105 { +106 // Do not replace the textarea right now, just hide it. the +107 // effective replacement will be done by the full core code. +108 textarea.style.visibility = 'hidden'; +109 +110 // Push the textarea in the array of pending replacements. +111 var pending = CKEDITOR.replace._pending || ( CKEDITOR.replace._pending = [] ); +112 pending.push( [ textarea, config ] ); +113 +114 // Check if it is time to load the full core code. +115 if ( CKEDITOR.loadFullCore && CKEDITOR.status == 'basic_ready' ) +116 CKEDITOR.loadFullCore(); +117 }; +118 +119 /** +120 * Replace all <textarea> elements available in the document with +121 * editor instances. +122 * @type undefined +123 * @example +124 * // Replace all <textarea> elements in the page. +125 * CKEDITOR.replaceAll(); +126 * @example +127 * // Replace all <textarea class="myClassName"> elements in the page. +128 * CKEDITOR.replaceAll( 'myClassName' ); +129 * @example +130 * // Selectively replace <textarea> elements, based on custom assertions. +131 * CKEDITOR.replaceAll( function( textarea, config ) +132 * { +133 * // Custom code to evaluate the replace, returning false +134 * // if it must not be done. +135 * // It also passes the "config" parameter, so the +136 * // developer can customize the instance. +137 * } ); +138 */ +139 CKEDITOR.replaceAll = function() +140 { +141 var textareas = document.getElementsByTagName( 'textarea' ); 142 -143 var classRegex = new RegExp( '(?:^| )' + arguments[0] + '(?:$| )' ); -144 -145 if ( !classRegex.test( textarea.className ) ) -146 continue; -147 } -148 else if ( typeof arguments[0] == 'function' ) -149 { -150 // An assertion function could be passed as the function parameter. -151 // It must explicitly return "false" to ignore a specific <textarea>. -152 config = {}; -153 if ( arguments[0]( textarea, config ) === false ) -154 continue; -155 } -156 -157 this.replace( textarea, config ); -158 } -159 }; -160 -161 CKEDITOR.create = function( instanceName, config ) -162 { -163 }; -164 -165 CKEDITOR.appendTo = function( element, config ) -166 { -167 }; -168 -169 if ( CKEDITOR.status == 'unloaded' ) -170 { -171 (function() -172 { -173 var onload = function() -174 { -175 // Replace all textareas with the default class name. -176 if ( CKEDITOR.replaceByClassEnabled ) -177 CKEDITOR.replaceAll( CKEDITOR.replaceClass ); -178 }; +143 for ( var i = 0 ; i < textareas.length ; i++ ) +144 { +145 var config = null; +146 var textarea = textareas[i]; +147 var name = textarea.name; +148 +149 // The "name" and/or "id" attribute must exist. +150 if ( !textarea.name && !textarea.id ) +151 continue; +152 +153 if ( typeof arguments[0] == 'string' ) +154 { +155 // The textarea class name could be passed as the function +156 // parameter. +157 +158 var classRegex = new RegExp( '(?:^| )' + arguments[0] + '(?:$| )' ); +159 +160 if ( !classRegex.test( textarea.className ) ) +161 continue; +162 } +163 else if ( typeof arguments[0] == 'function' ) +164 { +165 // An assertion function could be passed as the function parameter. +166 // It must explicitly return "false" to ignore a specific <textarea>. +167 config = {}; +168 if ( arguments[0]( textarea, config ) === false ) +169 continue; +170 } +171 +172 this.replace( textarea, config ); +173 } +174 }; +175 +176 CKEDITOR.create = function( instanceName, config ) +177 { +178 }; 179 -180 if ( window.addEventListener ) -181 window.addEventListener( 'load', onload, false ); -182 else if ( window.attachEvent ) -183 window.attachEvent( 'onload', onload ); -184 })(); -185 } -186 -187 CKEDITOR.status = 'basic_loaded'; -188 +180 CKEDITOR.appendTo = function( element, config ) +181 { +182 }; +183 +184 if ( CKEDITOR.status == 'unloaded' ) +185 { +186 (function() +187 { +188 var onload = function() +189 { +190 // Replace all textareas with the default class name. +191 if ( CKEDITOR.replaceByClassEnabled ) +192 CKEDITOR.replaceAll( CKEDITOR.replaceClass ); +193 +194 if ( CKEDITOR.replace._pending && CKEDITOR.status == 'basic_loaded' && CKEDITOR.loadFullCore ) +195 CKEDITOR.loadFullCore(); +196 +197 CKEDITOR.status = 'basic_ready'; +198 }; +199 +200 if ( window.addEventListener ) +201 window.addEventListener( 'load', onload, false ); +202 else if ( window.attachEvent ) +203 window.attachEvent( 'onload', onload ); +204 })(); +205 } +206 +207 CKEDITOR.status = 'basic_loaded'; +208 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 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__config.js.html (revision 2100) @@ -46,9 +46,13 @@ 39 baseHref : '', 40 - 41 /** - 42 * The theme to be used to build the UI. - 43 * @type String - 44 * @default 'default' - 45 */ - 46 theme : 'default' - 47 }; + 41 corePlugins : '', + 42 + 43 plugins : '', + 44 + 45 /** + 46 * The theme to be used to build the UI. + 47 * @type String + 48 * @default 'default' + 49 */ + 50 theme : 'default' + 51 }; 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 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_element.js.html (revision 2100) @@ -62,78 +62,90 @@ 55 }, 56 - 57 appendText : function( text ) + 57 insertAfter : function( element ) 58 { - 59 this.$.appendChild( document.createTextNode( text ) ); + 59 element.$.parentNode.insertBefore( this.$, element.$.nextSibling ); 60 }, 61 - 62 setText : function( text ) + 62 insertBefore : function( element ) 63 { - 64 this.$.text = text; + 64 element.$.parentNode.insertBefore( this.$, element.$ ); 65 }, 66 - 67 getId : function() + 67 appendText : function( text ) 68 { - 69 var id = this.$.id; - 70 return ( id && id.length > 0 ) ? id : null; - 71 }, - 72 - 73 /** - 74 * The value of the "name" attribute. - 75 * @example - 76 * var element = new CKEDITOR.dom.element( document.getElementsByName( 'test' )[0] ); - 77 * alert( element.getNameAtt() == 'test' ); // true - 78 */ - 79 getNameAtt : function() - 80 { - 81 var name = this.$.name - 82 return ( name && name.length > 0 ) ? name : null; - 83 }, - 84 - 85 /** - 86 * The element name. The name is always full lowercased. - 87 * @example - 88 * var element = new CKEDITOR.dom.element( 'span' ); - 89 * alert( element.getName() == 'span' ); // true - 90 */ - 91 getName : function() - 92 { - 93 // Cache the lowercased name inside a closure. - 94 var nodeName = this.$.nodeName.toLowerCase(); - 95 - 96 - 97 return ( - 98 /** @ignore */ - 99 this.getName = function() -100 { -101 return nodeName; -102 })(); -103 }, -104 -105 hide : function() -106 { -107 this.setStyle( 'display', 'none' ); -108 }, -109 -110 show : function() -111 { -112 this.setStyle( 'display', '' ); -113 }, -114 -115 setAttribute : function( attributeName, value ) -116 { -117 this.$.setAttribute( attributeName, value ); -118 }, -119 -120 setAttributes : function( attributesPairs ) -121 { -122 CKEDITOR.tools.each( attributesPairs, function( value, name ) -123 { -124 this.$.setAttribute( name, value ); -125 }, this); -126 }, -127 -128 setStyle : function( styleName, value ) -129 { -130 this.$.style[ styleName ] = value; -131 } -132 }; + 69 this.$.appendChild( document.createTextNode( text ) ); + 70 }, + 71 + 72 setText : function( text ) + 73 { + 74 this.$.text = text; + 75 }, + 76 + 77 setHtml : function( html ) + 78 { + 79 this.$.innerHTML = html; + 80 }, + 81 + 82 getId : function() + 83 { + 84 return this.$.id || null; + 85 }, + 86 + 87 /** + 88 * The value of the "name" attribute. + 89 * @example + 90 * var element = new CKEDITOR.dom.element( document.getElementsByName( 'test' )[0] ); + 91 * alert( element.getNameAtt() == 'test' ); // true + 92 */ + 93 getNameAtt : function() + 94 { + 95 return this.$.name || null; + 96 }, + 97 + 98 /** + 99 * The element name. The name is always full lowercased. +100 * @example +101 * var element = new CKEDITOR.dom.element( 'span' ); +102 * alert( element.getName() == 'span' ); // true +103 */ +104 getName : function() +105 { +106 // Cache the lowercased name inside a closure. +107 var nodeName = this.$.nodeName.toLowerCase(); +108 +109 return ( +110 /** @ignore */ +111 this.getName = function() +112 { +113 return nodeName; +114 })(); +115 }, +116 +117 hide : function() +118 { +119 this.setStyle( 'display', 'none' ); +120 }, +121 +122 show : function() +123 { +124 this.setStyle( 'display', '' ); +125 }, +126 +127 setAttribute : function( attributeName, value ) +128 { +129 this.$.setAttribute( attributeName, value ); +130 }, +131 +132 setAttributes : function( attributesPairs ) +133 { +134 CKEDITOR.tools.each( attributesPairs, function( value, name ) +135 { +136 this.$.setAttribute( name, value ); +137 }, this); +138 }, +139 +140 setStyle : function( styleName, value ) +141 { +142 this.$.style[ styleName ] = value; +143 } +144 }; 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 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html (revision 2100) @@ -44,39 +44,164 @@ 37 }; 38 - 39 // Basic config class to inherit the default settings from CKEDITOR.config. - 40 var config = function() - 41 {} - 42 config.prototype = CKEDITOR.config; - 43 - 44 return function( element ) - 45 { - 46 // Call the base constructor. - 47 CKEDITOR.event.call( this ); + 39 // ##### START: Config Privates + 40 + 41 // These function loads custom configuration files and cache the + 42 // CKEDITOR.editorConfig functions defined on them, so there is no need to + 43 // download them more than once for several instances. + 44 var loadConfigLoaded = {}; + 45 var loadConfig = function( editor ) + 46 { + 47 var customConfig = editor.config.customConfig; 48 - 49 this.element = element; - 50 this.name = element.getId() || element.getNameAtt() || getNewName(); - 51 - 52 // Get the default settings. - 53 this.config = new config(); - 54 }; - 55 }()); - 56 - 57 CKEDITOR.editor.prototype = - 58 { - 59 // The CKEDITOR.editor.fire will always pass itself as the "editor" - 60 // param in CKEDITOR.event.fire. So, we override it to do that - 61 // automaticaly. - 62 fire : function( eventName, data ) - 63 { - 64 return CKEDITOR.event.prototype.fire.call( this, eventName, data, this ); - 65 }, - 66 - 67 fireOnce : function( eventName, data ) - 68 { - 69 return CKEDITOR.event.prototype.fireOnce.call( this, eventName, data, this ); - 70 } - 71 }; - 72 - 73 // "Inherit" (copy actually) from CKEDITOR.event. - 74 CKEDITOR.tools.extend( CKEDITOR.editor.prototype, CKEDITOR.event.prototype ); - 75 + 49 // Check if there is a custom config to load. + 50 if ( !customConfig ) + 51 return false; + 52 + 53 var loadedConfig = loadConfigLoaded[ customConfig ] || ( loadConfigLoaded[ customConfig ] = { editors : [] } ); + 54 + 55 // If the custom config has already been downloaded, reuse it. + 56 if ( loadedConfig.fn ) + 57 { + 58 // Call the cached CKEDITOR.editorConfig defined in the custom + 59 // config file for the editor instance depending on it. + 60 loadedConfig.fn.call( editor, editor ); + 61 + 62 // If there is no other customConfig in the chain, fire the + 63 // "configloaded" event. + 64 if ( editor.config.customConfig == customConfig || !loadConfig( editor ) ) + 65 editor.fireOnce( 'customconfigloaded' ); + 66 } + 67 else + 68 { + 69 // Add the editor to the list of editors waiting for this config. + 70 loadedConfig.editors.push( editor ); + 71 + 72 // Load the custom configuration file. + 73 CKEDITOR.scriptLoader.load( customConfig, function() + 74 { + 75 // If the CKEDITOR.editorConfig function has been properly + 76 // defined in the custom configuration file, cache it. + 77 if ( CKEDITOR.editorConfig ) + 78 loadedConfig.fn = CKEDITOR.editorConfig; + 79 else + 80 loadedConfig.fn = function(){}; + 81 + 82 delete CKEDITOR.editorConfig; + 83 + 84 CKEDITOR.tools.each( loadedConfig.editors, function( editor ) + 85 { + 86 // Call the load config again. This time the custom + 87 // config is already cached and so it will get loaded. + 88 loadConfig( editor ); + 89 }); + 90 + 91 delete loadedConfig.editors; + 92 } ); + 93 } + 94 + 95 return true; + 96 }; + 97 + 98 var initConfig = function( editor, instanceConfig ) + 99 { +100 // Setup the lister for the "customconfigloaded" event. +101 editor.on( 'customconfigloaded', function() +102 { +103 // Overwrite the settings from the in-page config. +104 if ( instanceConfig ) +105 CKEDITOR.tools.extend( editor.config, instanceConfig, true ); +106 +107 // Fire the "configloaded" event. +108 editor.fireOnce( 'configloaded' ); +109 +110 // Start loading the plugins. +111 loadPlugins( editor ); +112 }); +113 +114 // The instance config may override the customConfig setting to avoid +115 // loading the default ~/config.js file. +116 if ( instanceConfig && instanceConfig.customConfig != undefined ) +117 editor.config.customConfig = instanceConfig.customConfig; +118 +119 // Load configs from the custom configuration files. +120 if ( !loadConfig( editor ) ) +121 editor.fireOnce( 'customconfigloaded' ); +122 }; +123 +124 // Basic config class to inherit the default settings from CKEDITOR.config. +125 var config = function() +126 {} +127 config.prototype = CKEDITOR.config; +128 +129 // ##### END: Config Privates +130 +131 var loadPlugins = function( editor ) +132 { +133 // Load all plugins defined in the "plugins" setting. +134 CKEDITOR.plugins.load( editor.config.plugins.split( ',' ), function( plugins ) +135 { +136 // Cache the loaded plugin names. +137 editor.plugins = plugins; +138 +139 // Initialize all plugins that have the "init" method defined. +140 for ( var i = 0 ; i < plugins.length ; i++ ) +141 { +142 var pluginName = plugins[ i ]; +143 var plugin = CKEDITOR.plugins.get( pluginName ); +144 if ( plugin && plugin.init ) +145 plugin.init( editor, CKEDITOR.plugins.getPath( pluginName ) ); +146 +147 // Load the editor theme. +148 loadTheme( editor ); +149 } +150 }); +151 }; +152 +153 var loadTheme = function( editor ) +154 { +155 var theme = editor.config.theme; +156 CKEDITOR.themes.load( theme, function() +157 { +158 CKEDITOR.themes.get( theme ).build( editor, CKEDITOR.themes.getPath( theme ) ); +159 }); +160 }; +161 +162 return function( element, instanceConfig ) +163 { +164 // Call the base constructor. +165 CKEDITOR.event.call( this ); +166 +167 this.element = element; +168 this.name = element.getId() || element.getNameAtt() || getNewName(); +169 +170 // Get the default settings. +171 this.config = new config(); +172 +173 // Call initConfig using events, to be sure that instancecreated is +174 // fired first. +175 this.on( 'instancecreated', function() +176 { +177 initConfig( this, instanceConfig ); +178 }); +179 }; +180 }()); +181 +182 CKEDITOR.editor.prototype = +183 { +184 // The CKEDITOR.editor.fire will always pass itself as the "editor" +185 // param in CKEDITOR.event.fire. So, we override it to do that +186 // automaticaly. +187 fire : function( eventName, data ) +188 { +189 return CKEDITOR.event.prototype.fire.call( this, eventName, data, this ); +190 }, +191 +192 fireOnce : function( eventName, data ) +193 { +194 return CKEDITOR.event.prototype.fireOnce.call( this, eventName, data, this ); +195 } +196 }; +197 +198 // "Inherit" (copy actually) from CKEDITOR.event. +199 CKEDITOR.tools.extend( CKEDITOR.editor.prototype, CKEDITOR.event.prototype ); +200 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 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html (revision 2100) @@ -40,5 +40,5 @@ 33 var scripts = 34 { - 35 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/scriptLoader', 'core/tools' ], + 35 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptLoader', 'core/tools' ], 36 'core/ajax' : [ 'core/xml' ], 37 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/editor', 'core/dom/element', 'core/event', 'core/tools' ], @@ -48,92 +48,106 @@ 41 'core/dom' : [], 42 'core/dom/element' : [ 'core/dom' ], - 43 'core/editor' : [ 'core/config', 'core/event', 'core/tools' ], + 43 'core/editor' : [ 'core/config', 'core/event', 'core/plugins', 'core/themes', 'core/tools' ], 44 'core/env' : [], 45 'core/event' : [], - 46 'core/scriptLoader' : [ 'core/dom/element', 'core/env' ], - 47 'core/tools' : [ 'core/env' ], - 48 'core/xml' : [ 'core/env' ] - 49 }; - 50 - 51 var loadedScripts = {}; - 52 - 53 /** @lends CKEDITOR.loader */ - 54 return { - 55 basePath : (function() - 56 { - 57 // This is a copy of CKEDITOR.basePath, but requires the script having - 58 // "_source/core/loader.js". - 59 if ( CKEDITOR && CKEDITOR.basePath ) - 60 return CKEDITOR.basePath; - 61 - 62 // Find out the editor directory path, based on its <script> tag. - 63 var path = ''; - 64 var scripts = document.getElementsByTagName( 'script' ); - 65 - 66 for ( var i = 0 ; i < scripts.length ; i++ ) - 67 { - 68 var match = scripts[i].src.match( /(^|.*[\\\/])_source\/core\/loader.js(?:\?.*)?$/i ); - 69 - 70 if ( match ) - 71 { - 72 path = match[1]; - 73 break; - 74 } - 75 } - 76 - 77 // In IE (only) the script.src string is the raw valued entered in the - 78 // HTML. Other browsers return the full resolved URL instead. - 79 if ( path.indexOf('://') == -1 ) - 80 { - 81 // Absolute path. - 82 if ( path.indexOf( '/' ) == 0 ) - 83 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; - 84 // Relative path. - 85 else - 86 path = location.href.match( /^[^\?]*\// )[0] + path; - 87 } - 88 - 89 return path; - 90 })(), + 46 'core/plugins' : [ 'core/resourceManager' ], + 47 'core/resourceManager' : [ 'core/scriptLoader', 'core/tools' ], + 48 'core/scriptLoader' : [ 'core/dom/element', 'core/env' ], + 49 'core/themes' : [ 'core/resourceManager' ], + 50 'core/tools' : [ 'core/env' ], + 51 'core/xml' : [ 'core/env' ] + 52 }; + 53 + 54 var loadedScripts = {}; + 55 + 56 /** @lends CKEDITOR.loader */ + 57 return { + 58 basePath : (function() + 59 { + 60 // This is a copy of CKEDITOR.basePath, but requires the script having + 61 // "_source/core/loader.js". + 62 if ( CKEDITOR && CKEDITOR.basePath ) + 63 return CKEDITOR.basePath; + 64 + 65 // Find out the editor directory path, based on its <script> tag. + 66 var path = ''; + 67 var scripts = document.getElementsByTagName( 'script' ); + 68 + 69 for ( var i = 0 ; i < scripts.length ; i++ ) + 70 { + 71 var match = scripts[i].src.match( /(^|.*[\\\/])_source\/core\/loader.js(?:\?.*)?$/i ); + 72 + 73 if ( match ) + 74 { + 75 path = match[1]; + 76 break; + 77 } + 78 } + 79 + 80 // In IE (only) the script.src string is the raw valued entered in the + 81 // HTML. Other browsers return the full resolved URL instead. + 82 if ( path.indexOf('://') == -1 ) + 83 { + 84 // Absolute path. + 85 if ( path.indexOf( '/' ) == 0 ) + 86 path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; + 87 // Relative path. + 88 else + 89 path = location.href.match( /^[^\?]*\// )[0] + path; + 90 } 91 - 92 /** - 93 * The list of loaded scripts in the loading order. - 94 * @type Array - 95 */ - 96 loadedScripts : [], - 97 - 98 load : function( scriptName ) - 99 { -100 // Check if the script has already been loaded. -101 if ( scriptName in loadedScripts ) -102 return; -103 -104 // Get the script dependencies list. -105 var dependencies = scripts[ scriptName ]; -106 if ( !dependencies ) -107 throw 'The script name"' + scriptName + '" is not defined.'; -108 -109 // Mark the script as loaded, even before really loading it, to -110 // avoid cross references recursion. -111 loadedScripts[ scriptName ] = true; -112 -113 // Load all dependencies first. -114 for ( var i = 0 ; i < dependencies.length ; i++ ) -115 this.load( dependencies[ i ] ); -116 -117 // Append this script to the list of loaded scripts. -118 this.loadedScripts.push( scriptName ); + 92 return path; + 93 })(), + 94 + 95 /** + 96 * The list of loaded scripts in the loading order. + 97 * @type Array + 98 */ + 99 loadedScripts : [], +100 +101 load : function( scriptName ) +102 { +103 // Check if the script has already been loaded. +104 if ( scriptName in loadedScripts ) +105 return; +106 +107 // Get the script dependencies list. +108 var dependencies = scripts[ scriptName ]; +109 if ( !dependencies ) +110 throw 'The script name"' + scriptName + '" is not defined.'; +111 +112 // Mark the script as loaded, even before really loading it, to +113 // avoid cross references recursion. +114 loadedScripts[ scriptName ] = true; +115 +116 // Load all dependencies first. +117 for ( var i = 0 ; i < dependencies.length ; i++ ) +118 this.load( dependencies[ i ] ); 119 -120 // Append the <script> element to the DOM. -121 document.write( '<script src="' + this.basePath + '_source/' + scriptName + '.js" type="text/javascript"><\/script>' ); -122 } -123 }; -124 })(); -125 -126 // Check if any script has been defined for autoload. -127 if ( CKEDITOR._autoLoad ) -128 { -129 CKEDITOR.loader.load( CKEDITOR._autoLoad ); -130 delete CKEDITOR._autoLoad; -131 } -132 +120 // Append this script to the list of loaded scripts. +121 this.loadedScripts.push( scriptName ); +122 +123 var scriptSrc = this.basePath + '_source/' + scriptName + '.js'; +124 +125 // Append the <script> element to the DOM. +126 if ( document.body ) +127 { +128 var script = document.createElement( 'script' ); +129 script.type = 'text/javascript'; +130 script.src = scriptSrc; +131 +132 document.body.appendChild( script ); +133 } +134 else +135 document.write( '<script src="' + scriptSrc + '" type="text/javascript"><\/script>' ); +136 } +137 }; +138 })(); +139 +140 // Check if any script has been defined for autoload. +141 if ( CKEDITOR._autoLoad ) +142 { +143 CKEDITOR.loader.load( CKEDITOR._autoLoad ); +144 delete CKEDITOR._autoLoad; +145 } +146 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__plugins.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__plugins.js.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__plugins.js.html (revision 2100) @@ -0,0 +1,35 @@ + 
      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  * Manages plugins registration and loading.
+ 24  * @namespace
+ 25  * @augments CKEDITOR.resourceManager
+ 26  */
+ 27 CKEDITOR.plugins = new CKEDITOR.resourceManager( CKEDITOR.basePath + '_source/plugins/', 'plugin' );
+ 28
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__resourcemanager.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__resourcemanager.js.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__resourcemanager.js.html (revision 2100) @@ -0,0 +1,149 @@ + 
      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  * Base class for resource managers, like plugins and themes.
+ 24  * @namespace
+ 25  */
+ 26 CKEDITOR.resourceManager = function( basePath, fileName )
+ 27 {
+ 28 	this.basePath = basePath;
+ 29 	this.fileName = fileName;
+ 30 
+ 31 	// List of callbacks waiting for plugins to be loaded.
+ 32 	this._waitingList = {};
+ 33 };
+ 34 
+ 35 CKEDITOR.resourceManager.prototype =
+ 36 {
+ 37 	registered : {},
+ 38 
+ 39 	loaded : {},
+ 40 	
+ 41 	externals : {},
+ 42 
+ 43 	add : function( name, definition )
+ 44 	{
+ 45 		if ( this.registered[ name ] )
+ 46 			throw '[CKEDITOR.resourceManager.add] The resource name "' + name + '" is already registered.';
+ 47 
+ 48 		this.registered[ name ] = definition;
+ 49 	},
+ 50 
+ 51 	get : function( name )
+ 52 	{
+ 53 		return this.registered[ name ] || null;
+ 54 	},
+ 55 	
+ 56 	getPath : function( name )
+ 57 	{
+ 58 		return this.loaded[ name ] || null;
+ 59 	},
+ 60 	
+ 61 	import : function( name, path )
+ 62 	{
+ 63 		if ( this.registered[ name ] || this.externals[ name ] )
+ 64 			throw '[CKEDITOR.resourceManager.import] The resource name "' + name + '" is already registered or imported.';
+ 65 
+ 66 		this.externals[ name ] = path;
+ 67 	},
+ 68 
+ 69 	/**
+ 70 	 * Loads one or more items.
+ 71 	 * @param {String|Array} name The name of the item to load.
+ 72 	 * @param {Function} callback A function to be called when all plugins are loaded.
+ 73 	 * @param {Object} [scope] The scope object to be used for the callback call.
+ 74 	 * @type {Undefined}
+ 75 	 */
+ 76 	load : function( name, callback, scope )
+ 77 	{
+ 78 		// Ensure that we have an Array of names.
+ 79 		var names = CKEDITOR.tools.isArray( name ) ? name : [ name ];
+ 80 
+ 81 		var total = names.length;
+ 82 
+ 83 		// Nothing to load, just call the callback.
+ 84 		if ( total == 0 )
+ 85 		{
+ 86 			callback.call( scope || window, names );
+ 87 			return;
+ 88 		}
+ 89 
+ 90 		// This function is used to count the loaded plugins and call the
+ 91 		// callback when finished loading.
+ 92 		callback._loaded = 0;
+ 93 		callback._total = total;
+ 94 		var loadCheck = function( callback )
+ 95 		{
+ 96 			if ( ++callback._loaded == callback._total )
+ 97 				callback.call( scope || window, names );
+ 98 		};
+ 99 
+100 		var loaded = this.loaded;
+101 		var waitingList = this._waitingList;
+102 
+103 		// Loop through all names.
+104 		for ( var i = 0 ; i < names.length ; i++ )
+105 		{
+106 			var name = names[ i ];
+107 
+108 			// If not loaded already.
+109 			if ( name && !loaded[ name ] && !this.registered[ name ] )
+110 			{
+111 				var waitingInfo = waitingList[ name ] || ( waitingList[ name ] = [] );
+112 				waitingInfo.push( callback );
+113 
+114 				// If this is the first call for it, go ahead loading.
+115 				if ( waitingInfo.length == 1 )
+116 				{
+117 					// Calculate the plugin script path.
+118 					var path = this.externals[ name ] || ( this.basePath + name + '/' );
+119 
+120 					// Load the plugin script.
+121 					CKEDITOR.scriptLoader.load( path + this.fileName + '.js', function( success )
+122 						{
+123 							if ( !success )
+124 								throw '[CKEDITOR.resourceManager.load] Resource name "' + name + '" was not found at "' + path + this.fileName + '.js".';
+125 
+126 							loaded[ name ] = path;
+127 
+128 							// Check all callbacks that were waiting for this
+129 							// resource.
+130 							for ( var j = 0 ; j < waitingList[ name ].length ; j++ )
+131 								loadCheck( waitingList[ name ][ j ] );
+132 
+133 							delete waitingList[ name ];
+134 						});
+135 				}
+136 			}
+137 			else
+138 				loadCheck( callback );
+139 		}
+140 	}
+141 };
+142
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__scriptloader.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__scriptloader.js.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__scriptloader.js.html (revision 2100) @@ -57,40 +57,52 @@ 50 if ( CKEDITOR.env.ie ) 51 { - 52 script.$.onreadystatechange = function () - 53 { - 54 if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) - 55 callback.call( scope || CKEDITOR ); - 56 } - 57 } - 58 else - 59 { - 60 script.$.onload = function() - 61 { - 62 callback.call( scope || CKEDITOR ); - 63 } - 64 } - 65 } - 66 - 67 // Append it to <head>. - 68 script.appendTo( CKEDITOR.dom.element.getHead() ); + 52 // FIXME: For IE, we are not able to return false on error (like 404). + 53 + 54 script.$.onreadystatechange = function () + 55 { + 56 if ( script.$.readyState == 'loaded' || script.$.readyState == 'complete' ) + 57 { + 58 script.$.onreadystatechange = null; + 59 callback.call( scope || CKEDITOR, true ); + 60 } + 61 } + 62 } + 63 else + 64 { + 65 script.$.onload = function() + 66 { + 67 callback.call( scope || CKEDITOR, true ); + 68 } 69 - 70 return true; - 71 }, - 72 - 73 loadCode : function( code ) - 74 { - 75 // Create the <script> element. - 76 var script = new CKEDITOR.dom.element( 'script' ); - 77 script.setAttribute( 'type', 'text/javascript' ); + 70 // FIXME: Opera and Safari will not fire onerror. + 71 + 72 script.$.onerror = function() + 73 { + 74 callback.call( scope || CKEDITOR, false ); + 75 } + 76 } + 77 } 78 - 79 if ( CKEDITOR.env.ie ) - 80 script.setText( code ); - 81 else - 82 script.appendText( code ); - 83 - 84 // Append it to <head>. - 85 script.appendTo( CKEDITOR.dom.element.getHead() ); - 86 } - 87 }; - 88 })(); - 89 + 79 // Append it to <head>. + 80 script.appendTo( CKEDITOR.dom.element.getHead() ); + 81 + 82 return true; + 83 }, + 84 + 85 loadCode : function( code ) + 86 { + 87 // Create the <script> element. + 88 var script = new CKEDITOR.dom.element( 'script' ); + 89 script.setAttribute( 'type', 'text/javascript' ); + 90 + 91 if ( CKEDITOR.env.ie ) + 92 script.setText( code ); + 93 else + 94 script.appendText( code ); + 95 + 96 // Append it to <head>. + 97 script.appendTo( CKEDITOR.dom.element.getHead() ); + 98 } + 99 }; +100 })(); +101 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__themes.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__themes.js.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__themes.js.html (revision 2100) @@ -0,0 +1,35 @@ + 
      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  * Manages themes registration and loading.
+ 24  * @namespace
+ 25  * @augments CKEDITOR.resourceManager
+ 26  */
+ 27 CKEDITOR.themes = new CKEDITOR.resourceManager( CKEDITOR.basePath + '_source/themes/', 'theme' );
+ 28
    Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__tools.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__tools.js.html (revision 2099) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__tools.js.html (revision 2100) @@ -130,5 +130,10 @@ 123 {} 124 } -125 } -126 }; -127 +125 }, +126 +127 isArray : function( object ) +128 { +129 return ( object && object instanceof Array ); +130 } +131 }; +132 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__sample_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__sample_plugin.js.html (revision 2100) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__sample_plugin.js.html (revision 2100) @@ -0,0 +1,39 @@ + 
      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( 'sample',
+ 23 {
+ 24 	init : function( editor, pluginPath )
+ 25 	{
+ 26 		editor.element.hide();
+ 27 
+ 28 		var div = new CKEDITOR.dom.element( 'div' );
+ 29 		div.setHtml( 'Plugin init for "' + editor.name + '" from "' + pluginPath + '".' );
+ 30 		div.insertAfter( editor.element );
+ 31 	}
+ 32 });
    Index: /CKEditor/branches/prototype/_source/core/editor.js =================================================================== --- /CKEditor/branches/prototype/_source/core/editor.js (revision 2099) +++ /CKEditor/branches/prototype/_source/core/editor.js (revision 2100) @@ -138,10 +138,23 @@ // Initialize all plugins that have the "init" method defined. - CKEDITOR.tools.each( plugins, function( plugin ) - { - var plugin = CKEDITOR.plugins.get( plugin ); - if ( plugin && plugin.init ) - plugin.init( editor ); - }); + for ( var i = 0 ; i < plugins.length ; i++ ) + { + var pluginName = plugins[ i ]; + var plugin = CKEDITOR.plugins.get( pluginName ); + if ( plugin && plugin.init ) + plugin.init( editor, CKEDITOR.plugins.getPath( pluginName ) ); + + // Load the editor theme. + loadTheme( editor ); + } + }); + }; + + var loadTheme = function( editor ) + { + var theme = editor.config.theme; + CKEDITOR.themes.load( theme, function() + { + CKEDITOR.themes.get( theme ).build( editor, CKEDITOR.themes.getPath( theme ) ); }); }; Index: /CKEditor/branches/prototype/_source/core/loader.js =================================================================== --- /CKEditor/branches/prototype/_source/core/loader.js (revision 2099) +++ /CKEditor/branches/prototype/_source/core/loader.js (revision 2100) @@ -41,9 +41,11 @@ 'core/dom' : [], 'core/dom/element' : [ 'core/dom' ], - 'core/editor' : [ 'core/config', 'core/event', 'core/tools' ], + 'core/editor' : [ 'core/config', 'core/event', 'core/plugins', 'core/themes', 'core/tools' ], 'core/env' : [], 'core/event' : [], - 'core/plugins' : [ 'core/scriptLoader', 'core/tools' ], + 'core/plugins' : [ 'core/resourceManager' ], + 'core/resourceManager' : [ 'core/scriptLoader', 'core/tools' ], 'core/scriptLoader' : [ 'core/dom/element', 'core/env' ], + 'core/themes' : [ 'core/resourceManager' ], 'core/tools' : [ 'core/env' ], 'core/xml' : [ 'core/env' ] Index: /CKEditor/branches/prototype/_source/core/plugins.js =================================================================== --- /CKEditor/branches/prototype/_source/core/plugins.js (revision 2099) +++ /CKEditor/branches/prototype/_source/core/plugins.js (revision 2100) @@ -23,97 +23,5 @@ * Manages plugins registration and loading. * @namespace + * @augments CKEDITOR.resourceManager */ -CKEDITOR.plugins = (function() -{ - // List of callbacks waiting for plugins to be loaded. - var waitingList = {}; - - return { - registeredPlugins : {}, - - loadedPlugins : {}, - - add : function( pluginName, pluginDefinition ) - { - if ( this.registeredPlugins[ pluginName ] ) - throw 'The plugin name "' + pluginName + '" is already registered.'; - - this.registeredPlugins[ pluginName ] = pluginDefinition; - }, - - get : function( pluginName ) - { - return this.registeredPlugins[ pluginName ]; - }, - - /** - * Loads one or more plugins. - * @param {String|Array} name The name of one or more plugins to load. - * @param {Function} callback A function to be called when all plugins are loaded. - * @param {Object} [scope] The scope object to be used for the callback call. - * @type {Undefined} - */ - load : function( name, callback, scope ) - { - // Ensure that we have an Array of names. - var names = CKEDITOR.tools.isArray( name ) ? name : [ name ]; - - var total = names.length; - - // Nothing to load, just call the callback. - if ( total == 0 ) - { - callback.call( scope || window, names ); - return; - } - - // This function is used to count the loaded plugins and call the - // callback when finished loading. - callback._loaded = 0; - callback._total = total; - var loadCheck = function( callback ) - { - if ( ++callback._loaded == callback._total ) - callback.call( scope || window, names ); - }; - - var loadedPlugins = this.loadedPlugins; - - // Loop through all names. - CKEDITOR.tools.each( names, function( pluginName ) - { - // If not loaded already. - if ( pluginName && !loadedPlugins[ pluginName ] ) - { - var waitingInfo = waitingList[ pluginName ] || ( waitingList[ pluginName ] = [] ); - waitingInfo.push( callback ); - - // If this is the first call for it, go ahead loading. - if ( waitingInfo.length == 1 ) - { - // Calculate the plugin script path. - var pluginPath = CKEDITOR.basePath + '_source/plugins/' + pluginName + '/'; - - // Load the plugin script. - CKEDITOR.scriptLoader.load( pluginPath + 'plugin.js', function( success ) - { - if ( !success ) - throw '[CKEDITOR.plugins.load] Plugin name "' + pluginName + '" was not found at "' + pluginPath + 'plugin.js".'; - - loadedPlugins[ pluginName ] = pluginPath; - - CKEDITOR.tools.each( waitingList[ pluginName ], function( waitingCallback ) - { - loadCheck( waitingCallback ); - }); - - delete waitingList[ pluginName ]; - }); - } - } - else - loadCheck( callback ); - }); - } - }; -})(); +CKEDITOR.plugins = new CKEDITOR.resourceManager( CKEDITOR.basePath + '_source/plugins/', 'plugin' ); Index: /CKEditor/branches/prototype/_source/core/resourcemanager.js =================================================================== --- /CKEditor/branches/prototype/_source/core/resourcemanager.js (revision 2100) +++ /CKEditor/branches/prototype/_source/core/resourcemanager.js (revision 2100) @@ -0,0 +1,141 @@ +/* + * 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 == + */ + + /** + * Base class for resource managers, like plugins and themes. + * @namespace + */ +CKEDITOR.resourceManager = function( basePath, fileName ) +{ + this.basePath = basePath; + this.fileName = fileName; + + // List of callbacks waiting for plugins to be loaded. + this._waitingList = {}; +}; + +CKEDITOR.resourceManager.prototype = +{ + registered : {}, + + loaded : {}, + + externals : {}, + + add : function( name, definition ) + { + if ( this.registered[ name ] ) + throw '[CKEDITOR.resourceManager.add] The resource name "' + name + '" is already registered.'; + + this.registered[ name ] = definition; + }, + + get : function( name ) + { + return this.registered[ name ] || null; + }, + + getPath : function( name ) + { + return this.loaded[ name ] || null; + }, + + import : function( name, path ) + { + if ( this.registered[ name ] || this.externals[ name ] ) + throw '[CKEDITOR.resourceManager.import] The resource name "' + name + '" is already registered or imported.'; + + this.externals[ name ] = path; + }, + + /** + * Loads one or more items. + * @param {String|Array} name The name of the item to load. + * @param {Function} callback A function to be called when all plugins are loaded. + * @param {Object} [scope] The scope object to be used for the callback call. + * @type {Undefined} + */ + load : function( name, callback, scope ) + { + // Ensure that we have an Array of names. + var names = CKEDITOR.tools.isArray( name ) ? name : [ name ]; + + var total = names.length; + + // Nothing to load, just call the callback. + if ( total == 0 ) + { + callback.call( scope || window, names ); + return; + } + + // This function is used to count the loaded plugins and call the + // callback when finished loading. + callback._loaded = 0; + callback._total = total; + var loadCheck = function( callback ) + { + if ( ++callback._loaded == callback._total ) + callback.call( scope || window, names ); + }; + + var loaded = this.loaded; + var waitingList = this._waitingList; + + // Loop through all names. + for ( var i = 0 ; i < names.length ; i++ ) + { + var name = names[ i ]; + + // If not loaded already. + if ( name && !loaded[ name ] && !this.registered[ name ] ) + { + var waitingInfo = waitingList[ name ] || ( waitingList[ name ] = [] ); + waitingInfo.push( callback ); + + // If this is the first call for it, go ahead loading. + if ( waitingInfo.length == 1 ) + { + // Calculate the plugin script path. + var path = this.externals[ name ] || ( this.basePath + name + '/' ); + + // Load the plugin script. + CKEDITOR.scriptLoader.load( path + this.fileName + '.js', function( success ) + { + if ( !success ) + throw '[CKEDITOR.resourceManager.load] Resource name "' + name + '" was not found at "' + path + this.fileName + '.js".'; + + loaded[ name ] = path; + + // Check all callbacks that were waiting for this + // resource. + for ( var j = 0 ; j < waitingList[ name ].length ; j++ ) + loadCheck( waitingList[ name ][ j ] ); + + delete waitingList[ name ]; + }); + } + } + else + loadCheck( callback ); + } + } +}; Index: /CKEditor/branches/prototype/_source/core/themes.js =================================================================== --- /CKEditor/branches/prototype/_source/core/themes.js (revision 2100) +++ /CKEditor/branches/prototype/_source/core/themes.js (revision 2100) @@ -0,0 +1,27 @@ +/* + * 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 == + */ + + /** + * Manages themes registration and loading. + * @namespace + * @augments CKEDITOR.resourceManager + */ +CKEDITOR.themes = new CKEDITOR.resourceManager( CKEDITOR.basePath + '_source/themes/', 'theme' ); Index: /CKEditor/branches/prototype/_source/plugins/sample/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/sample/plugin.js (revision 2099) +++ /CKEditor/branches/prototype/_source/plugins/sample/plugin.js (revision 2100) @@ -27,5 +27,5 @@ var div = new CKEDITOR.dom.element( 'div' ); - div.setHtml( 'Plugin init for "' + editor.name + '"' ); + div.setHtml( 'Plugin init for "' + editor.name + '" from "' + pluginPath + '".' ); div.insertAfter( editor.element ); } Index: /CKEditor/branches/prototype/_source/themes/default/theme.js =================================================================== --- /CKEditor/branches/prototype/_source/themes/default/theme.js (revision 2099) +++ /CKEditor/branches/prototype/_source/themes/default/theme.js (revision 2100) @@ -20,9 +20,13 @@ */ -CKEDITOR.theme.add( 'default', +CKEDITOR.themes.add( 'default', { - build : function { editor ) + build : function( editor, themePath ) { editor.element.hide(); + + var div = new CKEDITOR.dom.element( 'div' ); + div.setHtml( 'Theme init for "' + editor.name + '" from "' + themePath + '".' ); + div.insertAfter( editor.element ); } });