Index: /CKEditor/branches/prototype/_docs/api/files.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/files.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/files.html (revision 2261) @@ -213,4 +213,6 @@ + +

@@ -286,4 +288,8 @@

+ CKEDITOR.dom.selection +

+ +

CKEDITOR.dom.text

@@ -978,4 +984,24 @@

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

+ + +

+ Version: + 3.0 +

+ +

+ + +

+ + + + +

+ +

plugins/editingblock/plugin.js

@@ -1053,4 +1079,24 @@ Sample plugin. +

+ + + + +

+ +

../../_source/plugins/\selection\plugin.js

+ + +

+ Version: + 3.0 +

+ +

Returns:: {Boolean} "true" if the object is equal.; {CKEDITOR.dom.element} The <body> element.

@@ -724,9 +728,9 @@

- +

{CKEDITOR.dom.element} - getBody() + getById(elementId)

@@ -742,18 +746,29 @@

- Gets the <body> element for this document. - - -

- - - - -

var element = CKEDITOR.document.getBody();
-alert( element.getName() );  // "body"

- - - - + Gets and element based on its id. + + +

+ + + + +

var element = CKEDITOR.document.getById( 'myElement' );
+alert( element.getId() );  // "myElement"

+ + + + + +

Parameters:
+ {String} elementId + +: The element id.

@@ -763,5 +778,5 @@

Returns:

{CKEDITOR.dom.element} The <body> element.

{CKEDITOR.dom.element} The element instance, or null if not found.

@@ -772,9 +787,9 @@

- +

{CKEDITOR.dom.element} - getById(elementId) + getHead()

@@ -790,29 +805,18 @@

- Gets and element based on its id. - - -

- - - - -

var element = CKEDITOR.document.getById( 'myElement' );
-alert( element.getId() );  // "myElement"

- - - - - -

Parameters:
- {String} elementId - -: The element id.

+ Gets the <head> element for this document. + + + + + + + +

var element = CKEDITOR.document.getHead();
+alert( element.getName() );  // "head"

+ + + + @@ -822,5 +826,5 @@

Returns:

{CKEDITOR.dom.element} The element instance, or null if not found.

{CKEDITOR.dom.element} The <head> element.

@@ -831,9 +835,9 @@

- +

- {CKEDITOR.dom.element} - getHead() + {CKEDITOR.dom.selection} + getSelection()

@@ -849,14 +853,17 @@

- Gets the <head> element for this document. - - -

- - - - -

var element = CKEDITOR.document.getHead();
-alert( element.getName() );  // "head"

+ Gets the current selection from the document. + +
+ Defined in: plugins/selection/plugin.js. + + + + + + + +

var selection = CKEDITOR.instances.editor1.document.getSelection();
+alert( selection.getType() );

@@ -870,5 +877,5 @@

Returns:

{CKEDITOR.dom.element} The <head> element.

{CKEDITOR.dom.selection} A selection object.

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.domObject.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.domObject.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.domObject.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -431,9 +437,42 @@ + + + + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -507,7 +531,25 @@ + + + + + + + + + + @@ -781,9 +823,9 @@ - +

{Undefined} - addMode(mode, modeEditor) + addCommand(commandName, commandDefinition)

@@ -799,14 +841,13 @@

- Registers an editing mode. This function is to be used mainly by plugins. - -
- Defined in: plugins/editingblock/plugin.js. - - -

- - - + NO DOCUMENTATION AVAILABLE + + + + + + + +

NO EXAMPLE AVAILABLE

@@ -818,14 +859,14 @@

- {String} mode + commandName

The mode name.

- {Object} modeEditor + commandDefinition

The mode editor definition.

@@ -839,9 +880,9 @@

- +

{Undefined} - focus() + addMode(mode, modeEditor)

@@ -857,5 +898,5 @@

- Moves the selection focus to the editing are space in the editor. + Registers an editing mode. This function is to be used mainly by plugins.
@@ -868,9 +909,24 @@ -

NO EXAMPLE AVAILABLE

- - - - + + + + +

Parameters:
+ {String} mode + +: The mode name.
+ {Object} modeEditor + +: The mode editor definition.

@@ -882,9 +938,9 @@

- +

- {String} - getData() + {Undefined} + execCommand(commandName, data)

@@ -900,18 +956,13 @@

- Gets the editor data. The data will be in raw format. It is the same -data that is posted by the editor. - - -

- - - - -

if ( CKEDITOR.instances.editor1.getData() == '' )
-    alert( 'There is no data available' );

- - - + NO DOCUMENTATION AVAILABLE + + +

+ + + + +

NO EXAMPLE AVAILABLE

@@ -920,7 +971,17 @@

Returns:: (String) The editor data.
Parameters:
+ commandName + +
+ data + +

@@ -929,11 +990,14 @@ + + +

- +

{Undefined} - setData(data) + focus()

@@ -949,28 +1013,20 @@

- Sets the editor data. The data must be provided in raw format. - - -

- - - - -

CKEDITOR.instances.editor1.setData( '<p>This is the editor data.</p>' );

- - - - - -

Parameters:
- data - -

+ Moves the selection focus to the editing are space in the editor. + +
+ Defined in: plugins/editingblock/plugin.js. + + + + + + + +

NO EXAMPLE AVAILABLE

+ + + + @@ -982,9 +1038,9 @@

- +

{Undefined} - setMode(mode) + getCommand(commandName)

@@ -1000,17 +1056,13 @@

- Sets the current editing mode in this editor instance. - -
- Defined in: plugins/editingblock/plugin.js. - - -

- - - - -

// Switch to "source" view.
-CKEDITOR.instances.editor1.setMode( 'source' );

+ NO DOCUMENTATION AVAILABLE + + + + + + + +

NO EXAMPLE AVAILABLE

@@ -1022,8 +1074,8 @@

- {String} mode + commandName

A registered mode name.

@@ -1037,9 +1089,9 @@

- +

- {Undefined} - updateElement() + {String} + getData()

@@ -1055,4 +1107,211 @@

+ Gets the editor data. The data will be in raw format. It is the same +data that is posted by the editor. + + +

+ + + + +

if ( CKEDITOR.instances.editor1.getData() == '' )
+    alert( 'There is no data available' );

+ + + + + + + + +

Returns:: (String) The editor data.

+ + + + +

+ + +

+ + {CKEDITOR.dom.selection} + getSelection() + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

+ Gets the current selection from the editing area when in WYSIWYG mode. + +
+ Defined in: plugins/selection/plugin.js. + + +

+ + + + +

var selection = CKEDITOR.instances.editor1.getSelection();
+alert( selection.getType() );

+ + + + + + + + +

Returns:: {CKEDITOR.dom.selection} A selection object or null if not on + WYSIWYG mode or no selection is available.

+ + + + +

+ + +

+ + {Undefined} + setData(data) + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

+ Sets the editor data. The data must be provided in raw format. + + +

+ + + + +

CKEDITOR.instances.editor1.setData( '<p>This is the editor data.</p>' );

+ + + + + +

Parameters:
+ data + +

+ + + + + + + +

+ + +

+ + {Undefined} + setMode(mode) + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

+ Sets the current editing mode in this editor instance. + +
+ Defined in: plugins/editingblock/plugin.js. + + +

+ + + + +

// Switch to "source" view.
+CKEDITOR.instances.editor1.setMode( 'source' );

+ + + + + +

Parameters:
+ {String} mode + +: A registered mode name.

+ + + + + + + +

+ + +

+ + {Undefined} + updateElement() + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

Updates the <textarea> element that has been replaced by the editor with the current data available in the editor. Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.env.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.event.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.eventInfo.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -421,4 +427,34 @@

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

Method Summary

Method Attributes

Method Name and Description

- getCustomData +

equals(object) +

Determines whether the specified object is equal to the current object.

getCustomData(key)

Gets the value set to a data slot in this object.

@@ -444,6 +483,5 @@

- setCustomData +

setCustomData(key, value)

Sets a data slot value for this object.

@@ -457,16 +495,4 @@

- - - - - - - - - - - -

Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener

@@ -569,11 +595,19 @@ -

- - + + + + + + +

+ Method Detail +

+ +

- {Object} - getCustomData + {Boolean} + equals(object)

@@ -587,6 +621,7 @@

- Gets the value set to a data slot in this object. + Determines whether the specified object is equal to the current object. @@ -596,7 +631,7 @@ -

var element = new CKEDITOR.dom.element( 'span' );
-alert( element.getCustomData( 'hasCustomData' ) );  // e.g. 'true'

- +

var doc = new CKEDITOR.dom.document( document );
+alert( doc.equals( CKEDITOR.document ) );  // "true"
+alert( doc == CKEDITOR.document );         // "false"

@@ -605,7 +640,11 @@

See:: CKEDITOR.dom.domObject.prototype.setCustomData
Parameters:
+ {Object} object + +: The object to compare with the current object.

@@ -613,11 +652,22 @@ + +

Returns:: {Boolean} "true" if the object is equal.

+ + + +

- +

- {CKEDITOR.dom.domObject} - setCustomData + {Object} + getCustomData(key)

@@ -631,4 +681,71 @@

+ +

+ Gets the value set to a data slot in this object. + + +

+ + + + +

var element = new CKEDITOR.dom.element( 'span' );
+alert( element.getCustomData( 'hasCustomData' ) );  // e.g. 'true'

+ + + + + +

Parameters:
+ {String} key + +: The key used to identify the data slot.

+ + + + +

Returns:: {Object} This value set to the data slot.

+ + + +

See:: CKEDITOR.dom.domObject.prototype.setCustomData

+ + +

+ + {CKEDITOR.dom.domObject} + setCustomData(key, value) + +

+ + +

+ Since: + 3.0 +

+ +

Sets a data slot value for this object. These values are shared by all @@ -648,9 +765,37 @@ +

Parameters:
+ {String} key + +: A key used to identify the data slot.
+ {Object} value + +: The value to set to the data slot.

+ + + + +

Returns:: {CKEDITOR.dom.domObject} This DOM object instance.

+ +

See:: CKEDITOR.dom.domObject.prototype.getCustomData; CKEDITOR.dom.domObject.prototype.getCustomData

@@ -659,8 +804,4 @@ - - - - Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.element.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -437,5 +443,5 @@

Fields borrowed from class CKEDITOR.dom.domObject:: getCustomData, setCustomData

@@ -688,5 +694,5 @@

Methods borrowed from class CKEDITOR.dom.node:: appendTo, insertAfter, insertBefore
Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener
Methods borrowed from class CKEDITOR.dom.node:: appendTo, getParent, insertAfter, insertBefore
Methods borrowed from class CKEDITOR.dom.domObject:: equals, getCustomData, setCustomData
Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.event.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.event.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.event.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.node.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.node.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.node.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -437,5 +443,5 @@

Fields borrowed from class CKEDITOR.dom.domObject:: getCustomData, setCustomData

@@ -468,4 +474,13 @@

getParent() +

Gets the parent element for this node.

insertAfter(node)

@@ -489,5 +504,5 @@

Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener
Methods borrowed from class CKEDITOR.dom.domObject:: equals, getCustomData, setCustomData
Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener

@@ -671,9 +686,9 @@

- +

- {CKEDITOR.dom.node} - insertAfter(node) + {CKEDITOR.dom.element} + getParent()

@@ -689,32 +704,19 @@

- Inserts this element after a node. - - -

- - - - -

var em = new CKEDITOR.dom.element( 'em' );
-var strong = new CKEDITOR.dom.element( 'strong' );
-strong.insertAfter( em );
-
-// result: "<em></em><strong></strong>"

- - - - - -

Parameters:
- {CKEDITOR.dom.node} node - -: The that will preceed this element.

+ Gets the parent element for this node. + + + + + + + +

var node = editor.document.getBody().getFirst();
+var parent = node.getParent();
+alert( node.getName() );  // "body"

+ + + + @@ -724,6 +726,5 @@

Returns:

{CKEDITOR.dom.node} The node preceeding this one after - insertion.

{CKEDITOR.dom.element} The parent element.

@@ -734,9 +735,9 @@

- +

{CKEDITOR.dom.node} - insertBefore(node) + insertAfter(node)

@@ -752,4 +753,67 @@

+ Inserts this element after a node. + + +

+ + + + +

var em = new CKEDITOR.dom.element( 'em' );
+var strong = new CKEDITOR.dom.element( 'strong' );
+strong.insertAfter( em );
+
+// result: "<em></em><strong></strong>"

+ + + + + +

Parameters:
+ {CKEDITOR.dom.node} node + +: The that will preceed this element.

+ + + + +

Returns:: {CKEDITOR.dom.node} The node preceeding this one after + insertion.

+ + + + +

+ + +

+ + {CKEDITOR.dom.node} + insertBefore(node) + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

Inserts this element before a node. Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.selection.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.selection.html (revision 2261) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.selection.html (revision 2261) @@ -0,0 +1,750 @@ + + + + + + + JsDoc Reference - CKEDITOR.dom.selection + + + + + + + + + + + + +

+ +

Code Index +| File Index

Namespaces

Classes

+ +
+ +
+ +
+ +
+ +
+ CKEDITOR.dom.document +
+ CKEDITOR.dom.domObject +
+ CKEDITOR.dom.element +
+ CKEDITOR.dom.event +
+ CKEDITOR.dom.node +
+ CKEDITOR.dom.selection +
+ CKEDITOR.dom.text +
+ CKEDITOR.dom.window +
+ CKEDITOR.editor +
+ +
+ CKEDITOR.event +
+ CKEDITOR.eventInfo +
+ +
+ +
+ CKEDITOR.pluginDefinition +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ CKEDITOR.xml +

+ +

+ + Class CKEDITOR.dom.selection +

+ + +

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

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

Class Summary
Constructor Attributes	Constructor Name and Description
	+ + CKEDITOR.dom.selection(document) + + Manipulates the selection in a DOM document. +

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

Field Summary
Field Attributes	Field Name and Description
	+ + getNative + + Gets the native selection object from the browser. +
	+ + getType + + Gets the type of the current selection. +

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

Method Summary
Method Attributes	Method Name and Description
	+ getSelectedElement() + + Gets the current selected element. +
	+ getStartElement() + + Gets the DOM element in which the selection starts. +

+ + + + + + + +

+ Class Detail +

+ +

+ CKEDITOR.dom.selection(document) +

+ + +

+ Since: + 3.0 +

+ +

+ Manipulates the selection in a DOM document. + +

+ + + + + + + + + +

Parameters:
+ document + +

+ + + + + + + +

+ + + + +

+ Field Detail +

+ + +

+ + {Object} + getNative + +

+ + +

+ Since: + 3.0 +

+ +

+ Gets the native selection object from the browser. + + +

+ + + + +

var selection = editor.getSelection().getNative();

+ + + + + + + + +

+ + +

+ + {Number} + getType + +

+ + +

+ Since: + 3.0 +

+ +

+ Gets the type of the current selection. The following values are +available: +

CKEDITOR.SELECTION_NONE (1): No selection.
CKEDITOR.SELECTION_TEXT (2): Text is selected or + collapsed selection.
CKEDITOR.SELECTION_ELEMENT (3): A element + selection.

+ + +

+ + + + +

if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT )
+    alert( 'Text is selected' );

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

+ Method Detail +

+ + +

+ + {CKEDITOR.dom.element} + getSelectedElement() + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

+ Gets the current selected element. + + +

+ + + + +

var element = editor.getSelection().getSelectedElement();
+alert( element.getName() );

+ + + + + + + + +

Returns:: {CKEDITOR.dom.element} The selected element. Null if no + selection is available or the selection type is not + CKEDITOR.SELECTION_ELEMENT.

+ + + + +

+ + +

+ + {CKEDITOR.dom.element} + getStartElement() + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

+ Gets the DOM element in which the selection starts. + + +

+ + + + +

var element = editor.getSelection().getStartElement();
+alert( element.getName() );

+ + + + + + + + +

Returns:: {CKEDITOR.dom.element} The element at the beginning of the + selection.

+ + + + + + + + +

+ + +

+ + Documentation generated by JsDoc Toolkit +

+ + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.text.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.text.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.text.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -437,5 +443,5 @@

Fields borrowed from class CKEDITOR.dom.domObject:: getCustomData, setCustomData

@@ -449,5 +455,5 @@

Methods borrowed from class CKEDITOR.dom.node:: appendTo, insertAfter, insertBefore
Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener
Methods borrowed from class CKEDITOR.dom.node:: appendTo, getParent, insertAfter, insertBefore
Methods borrowed from class CKEDITOR.dom.domObject:: equals, getCustomData, setCustomData
Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.window.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.window.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.dom.window.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -414,5 +420,5 @@

Fields borrowed from class CKEDITOR.dom.domObject:: $, getCustomData, setCustomData
Fields borrowed from class CKEDITOR.dom.domObject:: $

@@ -448,5 +454,5 @@

Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener
Methods borrowed from class CKEDITOR.dom.domObject:: equals, getCustomData, setCustomData
Methods borrowed from class CKEDITOR.event:: fire, fireOnce, hasListeners, implementOn, on, removeListener

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.editor.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -489,7 +495,25 @@

addCommand(commandName, commandDefinition) +

NO DOCUMENTATION AVAILABLE

addMode(mode, modeEditor)

Registers an editing mode.

execCommand(commandName, data) +

NO DOCUMENTATION AVAILABLE

getCommand(commandName) +

NO DOCUMENTATION AVAILABLE

getData()

Gets the editor data.

getSelection() +

Gets the current selection from the editing area when in WYSIWYG mode.

+ CKEDITOR.SELECTION_ELEMENT +

Element selection.

+ CKEDITOR.SELECTION_NONE +

No selection.

+ CKEDITOR.SELECTION_TEXT +

Text or collapsed selection.

@@ -613,4 +649,124 @@ Field Detail + + +

<static> <constant> + + {Undefined} + CKEDITOR.SELECTION_ELEMENT + +

+ + +

+ Since: + 3.0 +

+ +

+ Element selection. + +
+ Defined in: plugins/selection/plugin.js. + + +

+ + + + +

if ( editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT )
+    alert( 'An element is selected' );

+ + + + + + + + +

+ + +

<static> <constant> + + {Undefined} + CKEDITOR.SELECTION_NONE + +

+ + +

+ Since: + 3.0 +

+ +

+ No selection. + +
+ Defined in: plugins/selection/plugin.js. + + +

+ + + + +

if ( editor.getSelection().getType() == CKEDITOR.SELECTION_NONE )
+    alert( 'Nothing is selected' );

+ + + + + + + + +

+ + +

<static> <constant> + + {Undefined} + CKEDITOR.SELECTION_TEXT + +

+ + +

+ Since: + 3.0 +

+ +

+ Text or collapsed selection. + +
+ Defined in: plugins/selection/plugin.js. + + +

+ + + + +

if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT )
+    alert( 'Text is selected' );

+ + + + + + + + +

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.lang.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.lang.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.lang.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.loader.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.pluginDefinition.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.pluginDefinition.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.pluginDefinition.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.plugins.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.resourceManager.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -836,5 +842,5 @@

{Object} definition - + Optional

The resource definition.

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.scriptLoader.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.skins.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.skins.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.skins.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.test.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.themes.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.tools.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

@@ -497,4 +503,13 @@

CKEDITOR.tools.setTimeout(func, milliseconds, scope, args, ownerWindow) +

Executes a function after specified delay.

@@ -577,5 +592,6 @@ -

NO EXAMPLE AVAILABLE

alert( CKEDITOR.tools.getNextNumber() );  // "1" (e.g.)
+alert( CKEDITOR.tools.getNextNumber() );  // "2"

@@ -925,4 +941,95 @@ +

+ + +

<static> + + {Object} + CKEDITOR.tools.setTimeout(func, milliseconds, scope, args, ownerWindow) + +

+ + +

+ Since: + 3.0 +

+ +

+ + +

+ Executes a function after specified delay. + + +

+ + + + +

CKEDITOR.tools.setTimeout(
+    function()
+    {
+        alert( 'Executed after 2 seconds' );
+    },
+    2000 );

+ + + + + +

Parameters:
+ {Function} func + +: The function to be executed.
+ {Number} milliseconds + Optional +: The amount of time (millisecods) to wait + to fire the function execution. Defaults to zero.
+ {Object} scope + Optional +: The object to hold the function execution scope + (the "this" object). By default the "window" object.
+ {Object|Array} args + Optional +: A single object, or an array of objects, to + pass as arguments to the function.
+ {Object} ownerWindow + Optional +: The window that will be used to set the + timeout. By default the current "window".

+ + + + +

Returns:: {Object} A value that can be used to cancel the function execution.

+ + + + Index: /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/CKEDITOR.xml.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

Index: /CKEditor/branches/prototype/_docs/api/symbols/_global_.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/_global_.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/_global_.html (revision 2261) @@ -218,4 +218,6 @@ + +

CKEDITOR.env

@@ -288,4 +290,8 @@

CKEDITOR.dom.node +

+ +

+ CKEDITOR.dom.selection

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 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__config.js.html (revision 2261) @@ -143,5 +143,5 @@ 136 * config.plugins = 'editingblock,toolbar,wysiwygarea'; 137 */ -138 plugins : 'editingblock,elementspath,htmldataprocessor,sourcearea,toolbar,wysiwygarea', +138 plugins : 'basicstyles,editingblock,elementspath,htmldataprocessor,selection,sourcearea,toolbar,wysiwygarea', 139 140 /** Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_document.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_document.js.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_document.js.html (revision 2261) @@ -35,127 +35,119 @@ 28 * Represents a DOM document. 29 * @constructor - 30 * @param {Object} domDocument A native DOM document. - 31 * @example - 32 * var document = new CKEDITOR.dom.document( document ); - 33 */ - 34 CKEDITOR.dom.document = function( domDocument ) - 35 { - 36 /** - 37 * The native DOM document represented by this class instance. - 38 * @type Object - 39 * @example - 40 */ - 41 this.$ = domDocument; - 42 }; - 43 - 44 CKEDITOR.dom.document.prototype = - 45 { - 46 /** - 47 * Appends a CSS file to the document. - 48 * @param {String} cssFileUrl The CSS file URL. - 49 * @example - 50 * CKEDITOR.document.appendStyleSheet( '/mystyles.css' ); - 51 */ - 52 appendStyleSheet : function( cssFileUrl ) - 53 { - 54 if ( this.$.createStyleSheet ) - 55 this.$.createStyleSheet( cssFileUrl ); - 56 else - 57 { - 58 var link = new CKEDITOR.dom.element( 'link' ); - 59 link.setAttributes( - 60 { - 61 rel :'stylesheet', - 62 type : 'text/css', - 63 href : cssFileUrl - 64 }); - 65 - 66 this.getHead().append( link ); - 67 } - 68 }, - 69 - 70 /** - 71 * Determines whether the specified object is equal to the current object. - 72 * @param {Object} object The object to compare with the current object. - 73 * @returns {Boolean} "true" if the object is equal. - 74 * @example - 75 * var doc = new CKEDITOR.dom.document( document ); - 76 * alert( doc.equals( CKEDITOR.document ) ); // "true" - 77 * alert( doc == CKEDITOR.document ); // "false" - 78 */ - 79 equals : function( object ) - 80 { - 81 return ( object && object.$ === this.$ ); - 82 }, - 83 - 84 /** - 85 * Gets and element based on its id. - 86 * @param {String} elementId The element id. - 87 * @returns {CKEDITOR.dom.element} The element instance, or null if not found. - 88 * @example - 89 * var element = CKEDITOR.document.getById( 'myElement' ); - 90 * alert( element.getId() ); // "myElement" - 91 */ - 92 getById : function( elementId ) - 93 { - 94 var $ = this.$.getElementById( elementId ); - 95 return $ ? new CKEDITOR.dom.element( $ ) : null; - 96 }, - 97 - 98 /** - 99 * Gets the <head> element for this document. -100 * @returns {CKEDITOR.dom.element} The <head> element. -101 * @example -102 * var element = CKEDITOR.document.getHead(); -103 * alert( element.getName() ); // "head" -104 */ -105 getHead : function() -106 { -107 var head = this.$.getElementsByTagName( 'head' )[0]; -108 head = new CKEDITOR.dom.element( head ); + 30 * @augments CKEDITOR.dom.domObject + 31 * @param {Object} domDocument A native DOM document. + 32 * @example + 33 * var document = new CKEDITOR.dom.document( document ); + 34 */ + 35 CKEDITOR.dom.document = function( domDocument ) + 36 { + 37 CKEDITOR.dom.domObject.call( this, domDocument ); + 38 + 39 /** + 40 * The native DOM document represented by this class instance. + 41 * @type Object + 42 * @example + 43 */ + 44 this.$ = domDocument; + 45 }; + 46 + 47 CKEDITOR.dom.document.prototype = new CKEDITOR.dom.domObject(); + 48 + 49 CKEDITOR.tools.extend( CKEDITOR.dom.document.prototype, + 50 /** @lends CKEDITOR.dom.document.prototype */ + 51 { + 52 /** + 53 * Appends a CSS file to the document. + 54 * @param {String} cssFileUrl The CSS file URL. + 55 * @example + 56 * CKEDITOR.document.appendStyleSheet( '/mystyles.css' ); + 57 */ + 58 appendStyleSheet : function( cssFileUrl ) + 59 { + 60 if ( this.$.createStyleSheet ) + 61 this.$.createStyleSheet( cssFileUrl ); + 62 else + 63 { + 64 var link = new CKEDITOR.dom.element( 'link' ); + 65 link.setAttributes( + 66 { + 67 rel :'stylesheet', + 68 type : 'text/css', + 69 href : cssFileUrl + 70 }); + 71 + 72 this.getHead().append( link ); + 73 } + 74 }, + 75 + 76 /** + 77 * Gets and element based on its id. + 78 * @param {String} elementId The element id. + 79 * @returns {CKEDITOR.dom.element} The element instance, or null if not found. + 80 * @example + 81 * var element = CKEDITOR.document.getById( 'myElement' ); + 82 * alert( element.getId() ); // "myElement" + 83 */ + 84 getById : function( elementId ) + 85 { + 86 var $ = this.$.getElementById( elementId ); + 87 return $ ? new CKEDITOR.dom.element( $ ) : null; + 88 }, + 89 + 90 /** + 91 * Gets the <head> element for this document. + 92 * @returns {CKEDITOR.dom.element} The <head> element. + 93 * @example + 94 * var element = CKEDITOR.document.getHead(); + 95 * alert( element.getName() ); // "head" + 96 */ + 97 getHead : function() + 98 { + 99 var head = this.$.getElementsByTagName( 'head' )[0]; +100 head = new CKEDITOR.dom.element( head ); +101 +102 return ( +103 /** @ignore */ +104 this.getHead = function() +105 { +106 return head; +107 })(); +108 }, 109 -110 return ( -111 /** @ignore */ -112 this.getHead = function() -113 { -114 return head; -115 })(); -116 }, -117 -118 /** -119 * Gets the <body> element for this document. -120 * @returns {CKEDITOR.dom.element} The <body> element. -121 * @example -122 * var element = CKEDITOR.document.getBody(); -123 * alert( element.getName() ); // "body" -124 */ -125 getBody : function() -126 { -127 var body = new CKEDITOR.dom.element( this.$.body ); +110 /** +111 * Gets the <body> element for this document. +112 * @returns {CKEDITOR.dom.element} The <body> element. +113 * @example +114 * var element = CKEDITOR.document.getBody(); +115 * alert( element.getName() ); // "body" +116 */ +117 getBody : function() +118 { +119 var body = new CKEDITOR.dom.element( this.$.body ); +120 +121 return ( +122 /** @ignore */ +123 this.getBody = function() +124 { +125 return body; +126 })(); +127 }, 128 -129 return ( -130 /** @ignore */ -131 this.getBody = function() -132 { -133 return body; -134 })(); -135 }, -136 -137 /** -138 * Get's the window object that holds this document. -139 * @returns {CKEDITOR.dom.window} The window object. -140 * @example -141 */ -142 getWindow : function() -143 { -144 var win = new CKEDITOR.dom.window( this.$.parentWindow || this.$.defaultView ); -145 -146 return ( -147 /** @ignore */ -148 this.getWindow = function() -149 { -150 return win; -151 })(); -152 } -153 }; -154 +129 /** +130 * Get's the window object that holds this document. +131 * @returns {CKEDITOR.dom.window} The window object. +132 * @example +133 */ +134 getWindow : function() +135 { +136 var win = new CKEDITOR.dom.window( this.$.parentWindow || this.$.defaultView ); +137 +138 return ( +139 /** @ignore */ +140 this.getWindow = function() +141 { +142 return win; +143 })(); +144 } +145 }); +146 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_domobject.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_domobject.js.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_domobject.js.html (revision 2261) @@ -45,130 +45,153 @@ 38 if ( nativeDomObject ) 39 { - 40 // Call the base event constructor. - 41 CKEDITOR.event.call( this ); - 42 - 43 /** - 44 * The native DOM object represented by this class instance. - 45 * @type Object - 46 * @example - 47 * var element = new CKEDITOR.dom.element( 'span' ); - 48 * alert( element.$.nodeType ); // "1" - 49 */ - 50 this.$ = nativeDomObject; - 51 } - 52 }; - 53 - 54 CKEDITOR.dom.domObject.prototype = (function() - 55 { - 56 // Do not define other local variables here. We want to keep the native - 57 // listener closures as clean as possible. + 40 /** + 41 * The native DOM object represented by this class instance. + 42 * @type Object + 43 * @example + 44 * var element = new CKEDITOR.dom.element( 'span' ); + 45 * alert( element.$.nodeType ); // "1" + 46 */ + 47 this.$ = nativeDomObject; + 48 + 49 // Get the main private function from the custom data. Create it if not + 50 // defined. + 51 if ( !( this._ = this.getCustomData( '_' ) ) ) + 52 this.setCustomData( '_', ( this._ = {} ) ); + 53 + 54 // Call the base event constructor. + 55 CKEDITOR.event.call( this ); + 56 } + 57 }; 58 - 59 var getNativeListener = function( domObject, eventName ) - 60 { - 61 return function( domEvent ) - 62 { - 63 domObject.fire( eventName, new CKEDITOR.dom.event( domEvent ) ); - 64 }; - 65 }; - 66 - 67 return /** @lends CKEDITOR.dom.domObject.prototype */ { - 68 - 69 /** @ignore */ - 70 on : function( eventName ) - 71 { - 72 // We customize the "on" function here. The basic idea is that we'll have - 73 // only one listener for a native event, which will then call all listeners - 74 // set to the event. - 75 - 76 // Get the listeners holder object. - 77 var nativeListeners = this.getCustomData( '_cke_nativeListeners' ) || this.setCustomData( '_cke_nativeListeners', {} ); - 78 - 79 // Check if we have a listener for that event. - 80 if ( !nativeListeners[ eventName ] ) - 81 { - 82 var listener = nativeListeners[ eventName ] = getNativeListener( this, eventName ); + 59 CKEDITOR.dom.domObject.prototype = (function() + 60 { + 61 // Do not define other local variables here. We want to keep the native + 62 // listener closures as clean as possible. + 63 + 64 var getNativeListener = function( domObject, eventName ) + 65 { + 66 return function( domEvent ) + 67 { + 68 domObject.fire( eventName, new CKEDITOR.dom.event( domEvent ) ); + 69 }; + 70 }; + 71 + 72 return /** @lends CKEDITOR.dom.domObject.prototype */ { + 73 + 74 /** @ignore */ + 75 on : function( eventName ) + 76 { + 77 // We customize the "on" function here. The basic idea is that we'll have + 78 // only one listener for a native event, which will then call all listeners + 79 // set to the event. + 80 + 81 // Get the listeners holder object. + 82 var nativeListeners = this.getCustomData( '_cke_nativeListeners' ) || this.setCustomData( '_cke_nativeListeners', {} ); 83 - 84 if ( this.$.addEventListener ) - 85 this.$.addEventListener( eventName, listener, false ); - 86 else if ( this.$.attachEvent ) - 87 this.$.attachEvent( 'on' + eventName, listener ); - 88 } - 89 - 90 // Call the original implementation. - 91 return CKEDITOR.event.prototype.on.apply( this, arguments ); - 92 }, - 93 - 94 /** @ignore */ - 95 removeListener : function( eventName ) - 96 { - 97 // Call the original implementation. - 98 CKEDITOR.event.prototype.fire.removeListener.apply( this, arguments ); - 99 -100 // If we don't have listeners for this event, clean the DOM up. -101 if ( !this.hasListeners( eventName ) ) -102 { -103 var nativeListeners = this.getCustomData( '_cke_nativeListeners' ); -104 var listener = nativeListeners && nativeListeners[ eventName ]; -105 if ( listener ) -106 { -107 if ( this.$.removeEventListener ) -108 this.$.removeEventListener( eventName, listener ); -109 else if ( this.$.dettachEvent ) -110 this.$.dettachEvent( eventName, listener ); -111 -112 delete nativeListeners[ eventName ]; -113 } -114 } -115 } -116 }; -117 })(); -118 -119 (function( domObjectProto ) -120 { -121 var customData = {}; -122 -123 /** -124 * Sets a data slot value for this object. These values are shared by all -125 * instances pointing to that same DOM object. -126 * @name CKEDITOR.dom.domObject.prototype.setCustomData -127 * @param {String} key A key used to identify the data slot. -128 * @param {Object} value The value to set to the data slot. -129 * @returns {CKEDITOR.dom.domObject} This DOM object instance. -130 * @see CKEDITOR.dom.domObject.prototype.getCustomData -131 * @example -132 * var element = new CKEDITOR.dom.element( 'span' ); -133 * element.setCustomData( 'hasCustomData', true ); -134 */ -135 domObjectProto.setCustomData = function( key, value ) -136 { -137 var expandoNumber = this.$._cke_expando || ( this.$._cke_expando = CKEDITOR.tools.getNextNumber() ), -138 dataSlot = customData[ expandoNumber ] || ( customData[ expandoNumber ] = {} ); -139 -140 dataSlot[ key ] = value; -141 -142 return this; -143 }; -144 -145 /** -146 * Gets the value set to a data slot in this object. -147 * @name CKEDITOR.dom.domObject.prototype.getCustomData -148 * @param {String} key The key used to identify the data slot. -149 * @returns {Object} This value set to the data slot. -150 * @see CKEDITOR.dom.domObject.prototype.setCustomData -151 * @example -152 * var element = new CKEDITOR.dom.element( 'span' ); -153 * alert( element.getCustomData( 'hasCustomData' ) ); // e.g. 'true' -154 */ -155 domObjectProto.getCustomData = function( key ) -156 { -157 var expandoNumber = this.$._cke_expando, -158 dataSlot = expandoNumber && customData[ expandoNumber ]; -159 -160 return ( dataSlot && dataSlot[ key ] ) || null; -161 }; -162 -163 // Implement CKEDITOR.event. -164 CKEDITOR.event.implementOn( domObjectProto ); -165 -166 })( CKEDITOR.dom.domObject.prototype ); -167 + 84 // Check if we have a listener for that event. + 85 if ( !nativeListeners[ eventName ] ) + 86 { + 87 var listener = nativeListeners[ eventName ] = getNativeListener( this, eventName ); + 88 + 89 if ( this.$.addEventListener ) + 90 this.$.addEventListener( eventName, listener, false ); + 91 else if ( this.$.attachEvent ) + 92 this.$.attachEvent( 'on' + eventName, listener ); + 93 } + 94 + 95 // Call the original implementation. + 96 return CKEDITOR.event.prototype.on.apply( this, arguments ); + 97 }, + 98 + 99 /** @ignore */ +100 removeListener : function( eventName ) +101 { +102 // Call the original implementation. +103 CKEDITOR.event.prototype.fire.removeListener.apply( this, arguments ); +104 +105 // If we don't have listeners for this event, clean the DOM up. +106 if ( !this.hasListeners( eventName ) ) +107 { +108 var nativeListeners = this.getCustomData( '_cke_nativeListeners' ); +109 var listener = nativeListeners && nativeListeners[ eventName ]; +110 if ( listener ) +111 { +112 if ( this.$.removeEventListener ) +113 this.$.removeEventListener( eventName, listener ); +114 else if ( this.$.dettachEvent ) +115 this.$.dettachEvent( eventName, listener ); +116 +117 delete nativeListeners[ eventName ]; +118 } +119 } +120 } +121 }; +122 })(); +123 +124 (function( domObjectProto ) +125 { +126 var customData = {}; +127 +128 /** +129 * Determines whether the specified object is equal to the current object. +130 * @name CKEDITOR.dom.domObject.prototype.equals +131 * @function +132 * @param {Object} object The object to compare with the current object. +133 * @returns {Boolean} "true" if the object is equal. +134 * @example +135 * var doc = new CKEDITOR.dom.document( document ); +136 * alert( doc.equals( CKEDITOR.document ) ); // "true" +137 * alert( doc == CKEDITOR.document ); // "false" +138 */ +139 domObjectProto.equals = function( object ) +140 { +141 return ( object && object.$ === this.$ ); +142 }, +143 +144 /** +145 * Sets a data slot value for this object. These values are shared by all +146 * instances pointing to that same DOM object. +147 * @name CKEDITOR.dom.domObject.prototype.setCustomData +148 * @function +149 * @param {String} key A key used to identify the data slot. +150 * @param {Object} value The value to set to the data slot. +151 * @returns {CKEDITOR.dom.domObject} This DOM object instance. +152 * @see CKEDITOR.dom.domObject.prototype.getCustomData +153 * @example +154 * var element = new CKEDITOR.dom.element( 'span' ); +155 * element.setCustomData( 'hasCustomData', true ); +156 */ +157 domObjectProto.setCustomData = function( key, value ) +158 { +159 var expandoNumber = this.$._cke_expando || ( this.$._cke_expando = CKEDITOR.tools.getNextNumber() ), +160 dataSlot = customData[ expandoNumber ] || ( customData[ expandoNumber ] = {} ); +161 +162 dataSlot[ key ] = value; +163 +164 return this; +165 }; +166 +167 /** +168 * Gets the value set to a data slot in this object. +169 * @name CKEDITOR.dom.domObject.prototype.getCustomData +170 * @function +171 * @param {String} key The key used to identify the data slot. +172 * @returns {Object} This value set to the data slot. +173 * @see CKEDITOR.dom.domObject.prototype.setCustomData +174 * @example +175 * var element = new CKEDITOR.dom.element( 'span' ); +176 * alert( element.getCustomData( 'hasCustomData' ) ); // e.g. 'true' +177 */ +178 domObjectProto.getCustomData = function( key ) +179 { +180 var expandoNumber = this.$._cke_expando, +181 dataSlot = expandoNumber && customData[ expandoNumber ]; +182 +183 return ( dataSlot && dataSlot[ key ] ) || null; +184 }; +185 +186 // Implement CKEDITOR.event. +187 CKEDITOR.event.implementOn( domObjectProto ); +188 +189 })( CKEDITOR.dom.domObject.prototype ); +190 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_node.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_node.js.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__dom_node.js.html (revision 2261) @@ -91,39 +91,53 @@ 84 return element; 85 }, - 86 + 86 87 /** - 88 * Inserts this element after a node. - 89 * @param {CKEDITOR.dom.node} node The that will preceed this element. - 90 * @returns {CKEDITOR.dom.node} The node preceeding this one after - 91 * insertion. - 92 * @example - 93 * var em = new CKEDITOR.dom.element( 'em' ); - 94 * var strong = new CKEDITOR.dom.element( 'strong' ); - 95 * strong.insertAfter( em ); - 96 * - 97 * // result: "" - 98 */ - 99 insertAfter : function( node ) -100 { -101 node.$.parentNode.insertBefore( this.$, node.$.nextSibling ); -102 return node; -103 }, -104 -105 /** -106 * Inserts this element before a node. -107 * @param {CKEDITOR.dom.node} node The that will be after this element. -108 * @returns {CKEDITOR.dom.node} The node after this one after insertion. -109 * @example -110 * var em = new CKEDITOR.dom.element( 'em' ); -111 * var strong = new CKEDITOR.dom.element( 'strong' ); -112 * strong.insertBefore( em ); -113 * -114 * // result: "" -115 */ -116 insertBefore : function( node ) -117 { -118 node.$.parentNode.insertBefore( this.$, node.$ ); -119 } -120 } -121 ); -122 + 88 * Gets the parent element for this node. + 89 * @returns {CKEDITOR.dom.element} The parent element. + 90 * @example + 91 * var node = editor.document.getBody().getFirst(); + 92 * var parent = node.getParent(); + 93 * alert( node.getName() ); // "body" + 94 */ + 95 getParent : function() + 96 { + 97 var parent = this.$.parentNode; + 98 return parent ? new CKEDITOR.dom.element( this.$.parentNode ) : null; + 99 }, +100 +101 /** +102 * Inserts this element after a node. +103 * @param {CKEDITOR.dom.node} node The that will preceed this element. +104 * @returns {CKEDITOR.dom.node} The node preceeding this one after +105 * insertion. +106 * @example +107 * var em = new CKEDITOR.dom.element( 'em' ); +108 * var strong = new CKEDITOR.dom.element( 'strong' ); +109 * strong.insertAfter( em ); +110 * +111 * // result: "" +112 */ +113 insertAfter : function( node ) +114 { +115 node.$.parentNode.insertBefore( this.$, node.$.nextSibling ); +116 return node; +117 }, +118 +119 /** +120 * Inserts this element before a node. +121 * @param {CKEDITOR.dom.node} node The that will be after this element. +122 * @returns {CKEDITOR.dom.node} The node after this one after insertion. +123 * @example +124 * var em = new CKEDITOR.dom.element( 'em' ); +125 * var strong = new CKEDITOR.dom.element( 'strong' ); +126 * strong.insertBefore( em ); +127 * +128 * // result: "" +129 */ +130 insertBefore : function( node ) +131 { +132 node.$.parentNode.insertBefore( this.$, node.$ ); +133 } +134 } +135 ); +136 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 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__editor.js.html (revision 2261) @@ -184,121 +184,143 @@ 177 return function( element, instanceConfig ) 178 { -179 this._ = {}; -180 -181 // Call the base constructor. -182 CKEDITOR.event.call( this ); +179 this._ = +180 { +181 commands : {} +182 }; 183 -184 /** -185 * The DOM element that has been replaced by this editor instance. This -186 * element holds the editor data on load and post. -187 * @name CKEDITOR.editor.prototype.element -188 * @type CKEDITOR.dom.element -189 * @example -190 * var editor = CKEDITOR.instances.editor1; -191 * alert( editor.element.getName() ); "textarea" -192 */ -193 this.element = element; -194 -195 /** -196 * The editor instance name. It hay be the replaced element id, name or -197 * a default name using a progressive counter (editor1, editor2, ...). -198 * @name CKEDITOR.editor.prototype.name -199 * @type String -200 * @example -201 * var editor = CKEDITOR.instances.editor1; -202 * alert( editor.name ); "editor1" -203 */ -204 this.name = element.getId() || element.getNameAtt() || getNewName(); -205 -206 /** -207 * The configurations for this editor instance. It inherits all -208 * settings defined in (@link CKEDITOR.config}, combined with settings -209 * loaded from custom configuration files and those defined inline in -210 * the page when creating the editor. -211 * @name CKEDITOR.editor.prototype.config -212 * @type Object -213 * @example -214 * var editor = CKEDITOR.instances.editor1; -215 * alert( editor.config.theme ); "default" e.g. -216 */ -217 this.config = new config(); -218 -219 // Call initConfig using events, to be sure that instanceCreated is -220 // fired first. -221 this.on( 'instanceCreated', function() -222 { -223 initConfig( this, instanceConfig ); -224 }); -225 }; -226 }()); -227 -228 CKEDITOR.editor.prototype = -229 { -230 // Both fire and fireOnce will always pass this editor instance as the -231 // "editor" param in CKEDITOR.event.fire. So, we override it to do that -232 // automaticaly. -233 -234 /** @ignore */ -235 fire : function( eventName, data ) -236 { -237 return CKEDITOR.event.prototype.fire.call( this, eventName, data, this ); -238 }, -239 -240 /** @ignore */ -241 fireOnce : function( eventName, data ) -242 { -243 return CKEDITOR.event.prototype.fireOnce.call( this, eventName, data, this ); -244 }, -245 -246 /** -247 * Gets the editor data. The data will be in raw format. It is the same -248 * data that is posted by the editor. -249 * @type String -250 * @returns (String) The editor data. -251 * @example -252 * if ( CKEDITOR.instances.editor1.getData() == '' ) -253 * alert( 'There is no data available' ); -254 */ -255 getData : function() -256 { -257 this.fire( 'beforeGetData' ); -258 -259 // Fire "getData" so data manipulation may happen. -260 var eventData = { dataValue : this._.data || this.element.$.value }; -261 this.fire( 'getData', eventData ); -262 -263 return eventData.dataValue; -264 }, -265 -266 /** -267 * Sets the editor data. The data must be provided in raw format. -268 * @example -269 * CKEDITOR.instances.editor1.setData( 'This is the editor data.' ); -270 */ -271 setData : function( data ) -272 { -273 // Fire "setData" so data manipulation may happen. -274 var eventData = { dataValue : data }; -275 this.fire( 'setData', eventData ); -276 -277 this._.data = eventData.dataValue; -278 -279 this.fire( 'afterSetData' ); -280 }, -281 -282 /** -283 * Updates the <textarea> element that has been replaced by the editor with -284 * the current data available in the editor. -285 * @example -286 * CKEDITOR.instances.editor1.updateElement(); -287 * alert( document.getElementById( 'editor1' ).value ); // The current editor data. -288 */ -289 updateElement : function() -290 { -291 this.element.$.value = this.getData(); -292 } -293 }; -294 -295 // "Inherit" (copy actually) from CKEDITOR.event. -296 CKEDITOR.event.implementOn( CKEDITOR.editor.prototype ); -297 +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( editor.element.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( editor.name ); "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( editor.config.theme ); "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.getData() == '' ) +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.setData( 'This is the editor data.' ); +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 Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__listslib.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__listslib.js.html (revision 2261) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__listslib.js.html (revision 2261) @@ -0,0 +1,38 @@ +

  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  * Test have proved that check for the existence of a key in an object is the
+ 22  * most efficient list entry check (10x faster that regex). Example:
+ 23  *		if ( FCKListsLib.<ListName>[ key ] )
+ 24  */
+ 25
+ 26 CKEDITOR.listsLib =
+ 27 {
+ 28 	// Object elements for the Styles System.
+ 29 	styleObjectElements : { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 }
+ 30 };
+ 31

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 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__loader.js.html (revision 2261) @@ -49,5 +49,5 @@ 42 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptLoader', 'core/tools', /* The following are entries that we wnat to force loading to at the end to avoid dependence recursion */ 'core/dom/text' ], 43 'core/ajax' : [ 'core/xml' ], - 44 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/tools' ], + 44 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/listslib', 'core/tools' ], 45 'core/ckeditor_base' : [], 46 'core/ckeditor_basic' : [ 'core/env', 'core/event' ], @@ -57,5 +57,5 @@ 50 'core/dom/element' : [ 'core/dom', 'core/dom/document', 'core/dom/domobject', 'core/dom/node', 'core/tools' ], 51 'core/dom/event' : [], - 52 'core/dom/node' : [ 'core/dom/domobject' ], + 52 'core/dom/node' : [ 'core/dom/domobject', 'core/tools' ], 53 'core/dom/domobject' : [ 'core/dom/event' ], 54 'core/dom/text' : [ 'core/dom/node', 'core/dom/domobject' ], @@ -64,129 +64,130 @@ 57 'core/env' : [], 58 'core/event' : [], - 59 'core/plugins' : [ 'core/resourceManager' ], - 60 'core/resourceManager' : [ 'core/scriptLoader', 'core/tools' ], - 61 'core/scriptLoader' : [ 'core/dom/element', 'core/env' ], - 62 'core/skins' : [], - 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( CKEDITOR.loader.loadedScripts ); -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 + 59 'core/listslib' : [], + 60 'core/plugins' : [ 'core/resourceManager' ], + 61 'core/resourceManager' : [ 'core/scriptLoader', 'core/tools' ], + 62 'core/scriptLoader' : [ 'core/dom/element', 'core/env' ], + 63 'core/skins' : [], + 64 'core/themes' : [ 'lang/en', 'core/resourceManager' ], + 65 'core/tools' : [ 'core/env' ], + 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( CKEDITOR.loader.loadedScripts ); +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__resourcemanager.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__resourcemanager.js.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__resourcemanager.js.html (revision 2261) @@ -100,5 +100,5 @@ 93 * Registers a resource. 94 * @param {String} name The resource name. - 95 * @param {Object} definition The resource definition. + 95 * @param {Object} [definition] The resource definition. 96 * @example 97 * CKEDITOR.plugins.add( 'sample', { ... plugin definition ... } ); @@ -110,5 +110,5 @@ 103 throw '[CKEDITOR.resourceManager.add] The resource name "' + name + '" is already registered.'; 104 -105 this.registered[ name ] = definition; +105 this.registered[ name ] = definition || {}; 106 }, 107 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 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_core__tools.js.html (revision 2261) @@ -180,13 +180,55 @@ 173 * progressive numbers starting at 1. 174 * @returns {Number} A unique number. -175 */ -176 getNextNumber : (function() -177 { -178 var last = 0; -179 return function() -180 { -181 return ++last; -182 }; -183 })() -184 }; -185 +175 * @example +176 * alert( CKEDITOR.tools.getNextNumber() ); // "1" (e.g.) +177 * alert( CKEDITOR.tools.getNextNumber() ); // "2" +178 */ +179 getNextNumber : (function() +180 { +181 var last = 0; +182 return function() +183 { +184 return ++last; +185 }; +186 })(), +187 +188 /** +189 * Executes a function after specified delay. +190 * @param {Function} func The function to be executed. +191 * @param {Number} [milliseconds] The amount of time (millisecods) to wait +192 * to fire the function execution. Defaults to zero. +193 * @param {Object} [scope] The object to hold the function execution scope +194 * (the "this" object). By default the "window" object. +195 * @param {Object|Array} [args] A single object, or an array of objects, to +196 * pass as arguments to the function. +197 * @param {Object} [ownerWindow] The window that will be used to set the +198 * timeout. By default the current "window". +199 * @returns {Object} A value that can be used to cancel the function execution. +200 * @example +201 * CKEDITOR.tools.setTimeout( +202 * function() +203 * { +204 * alert( 'Executed after 2 seconds' ); +205 * }, +206 * 2000 ); +207 */ +208 setTimeout : function( func, milliseconds, scope, args, ownerWindow ) +209 { +210 if ( !ownerWindow ) +211 ownerWindow = window; +212 +213 if ( !scope ) +214 scope = ownerWindow; +215 +216 return ownerWindow.setTimeout( +217 function() +218 { +219 if ( args ) +220 func.apply( scope, [].concat( args ) ) ; +221 else +222 func.apply( scope ) ; +223 }, +224 milliseconds || 0 ); +225 } +226 }; +227 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 2261) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__basicstyles_plugin.js.html (revision 2261) @@ -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 CKEDITOR.plugins.add( 'basicstyles',
+ 23 {
+ 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

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 2261) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__selection_plugin.js.html (revision 2261) @@ -0,0 +1,344 @@ +

  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 (function()
+ 23 {
+ 24 	// #### checkSelectionChange : START
+ 25
+ 26 	// The selection change check basically saves the element parent tree of
+ 27 	// the current node and check it on successive requests. If there is any
+ 28 	// change on the tree, then the selectionChange event gets fired.
+ 29 	var checkSelectionPreviousPath;
+ 30 	var checkSelectionChange = function()
+ 31 	{
+ 32 		// In IE, the "selectionchange" event may still get thrown when
+ 33 		// releasing the WYSIWYG mode, so we need to check it first.
+ 34 		var sel = this.getSelection();
+ 35 		if ( !sel )
+ 36 			return;
+ 37
+ 38 		// Get the element at the start of the selection.
+ 39 		var node = this.getSelection().getStartElement(),
+ 40 			changed,
+ 41 			currentPath = [],
+ 42 			counter = 0;
+ 43
+ 44 		// Loops through the parent tree of the main node.
+ 45 		while( node )
+ 46 		{
+ 47 			// Look for changes in the parent node tree.
+ 48 			if ( !changed && ( !checkSelectionPreviousPath || !node.equals( checkSelectionPreviousPath[ counter++ ] ) ) )
+ 49 				changed = true;
+ 50
+ 51 			currentPath.push( node );
+ 52 			node = node.getParent();
+ 53 		}
+ 54
+ 55 		checkSelectionPreviousPath = currentPath;
+ 56
+ 57 		if ( changed )
+ 58 			this.fire( 'selectionChange' );
+ 59 	};
+ 60
+ 61 	var checkSelectionChangeTimer;
+ 62 	var checkSelectionChangeTimeout = function()
+ 63 	{
+ 64 		if ( checkSelectionChangeTimer )
+ 65 			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
+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;
+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 						}
+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();
+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 			}
+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;
+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 })();

Index: /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__wysiwygarea_plugin.js.html =================================================================== --- /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__wysiwygarea_plugin.js.html (revision 2260) +++ /CKEditor/branches/prototype/_docs/api/symbols/src/_source_plugins__wysiwygarea_plugin.js.html (revision 2261) @@ -32,241 +32,293 @@ 25 */ 26 - 27 CKEDITOR.plugins.add( 'wysiwygarea', + 27 (function() 28 { - 29 init : function( editor, pluginPath ) - 30 { - 31 editor.on( 'editingBlockReady', function() - 32 { - 33 var mainElement, - 34 iframe, - 35 isLoadingData, - 36 isPendingFocus; + 29 // Matches all self-closing tags that are not defined as empty elements in + 30 // the DTD (like ). + 31 var invalidSelfCloseTagsRegex = /(<(?!br|hr|base|meta|link|param|img|area|input|col)([a-zA-Z0-9:]+)[^>]*)\/>/gi; + 32 + 33 // #### protectEvents - START + 34 + 35 // Matches all tags that have event attributes (onXYZ). + 36 var tagsWithEventRegex = /<[^\>]+ on\w+\s*=[\s\S]+?\>/g; 37 - 38 // The following information is needed for IE only. - 39 var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname; + 38 // Matches all event attributes. + 39 var eventAttributesRegex = /\s(on\w+)(?=\s*=\s*?('|")[\s\S]*?\2)/g; 40 - 41 // Creates the iframe that holds the editable document. - 42 var createIFrame = function() - 43 { - 44 if ( iframe ) - 45 iframe.remove(); - 46 - 47 iframe = new CKEDITOR.dom.element( 'iframe' ) - 48 .setAttributes({ - 49 frameBorder : 0, - 50 allowTransparency : true }) - 51 .setStyles({ - 52 width : '100%', - 53 height : '100%' }); + 41 // Matches the protected attribute prefix. + 42 var protectedEventsRegex = /_cke_pa_/g; + 43 + 44 var protectEvents = function( html ) + 45 { + 46 return html.replace( tagsWithEventRegex, protectEvents_ReplaceTags ); + 47 }; + 48 + 49 var protectEvents_ReplaceTags = function( tagMatch ) + 50 { + 51 // Appends the "_cke_pa_" prefix to the event name. + 52 return tagMatch.replace( eventAttributesRegex, ' _cke_pa_$1' ); + 53 }; 54 - 55 if ( CKEDITOR.env.ie ) - 56 { - 57 if ( isCustomDomain ) - 58 { - 59 // The document domain must be set within the src - 60 // attribute. - 61 iframe.setAttribute( 'src', - 62 'javascript:void( (function(){' + - 63 'document.open();' + - 64 'document.domain="' + document.domain + '";' + - 65 'document.write( window.parent._cke_htmlToLoad_' + editor.name + ' );' + - 66 'document.close();' + - 67 'window.parent._cke_htmlToLoad_' + editor.name + ' = null;' + - 68 '})() )' ); - 69 } - 70 else - 71 // To avoid HTTPS warnings. - 72 iframe.setAttribute( 'src', 'javascript:void(0)' ); - 73 } - 74 - 75 // Append the new IFRAME to the main element. For IE, it - 76 // must be done after setting the "src", to avoid the - 77 // "secure/unsecure" message under HTTPS. - 78 mainElement.append( iframe ); - 79 }; - 80 - 81 // The script that is appended to the data being loaded. It - 82 // enables editing, and makes some - 83 var activationScript = - 84 '<script id="cke_actscrpt" type="text/javascript">' + - 85 'window.onload = function()' + - 86 '{' + - 87 // Remove this script from the DOM. - 88 'var s = document.getElementById( "cke_actscrpt" );' + - 89 's.parentNode.removeChild( s );' + - 90 - 91 // Call the temporary function for the editing - 92 // boostrap. - 93 'window.parent.CKEDITOR.instances.' + editor.name + '._.contentDomReady( window );' + - 94 '}' + - 95 '</script>'; - 96 - 97 // Editing area bootstrap code. - 98 var contentDomReady = function( domWindow ) - 99 { -100 delete editor._.contentDomReady; -101 -102 var domDocument = domWindow.document, -103 body = domDocument.body; -104 -105 body.spellcheck = !editor.config.disableNativeSpellChecker; -106 -107 if ( CKEDITOR.env.ie ) -108 { -109 // Disable and re-enable the body to avoid IE from -110 // taking the editing focus at startup. (#141 / #523) -111 body.disabled = true; -112 body.contentEditable = true; -113 body.removeAttribute( 'disabled' ); -114 } -115 else -116 domDocument.designMode = 'on'; -117 -118 // IE, Opera and Safari may not support it and throw -119 // errors. -120 try { domDocument.execCommand( 'enableObjectResizing', false, !editor.config.disableObjectResizing ) ; } catch(e) {} -121 try { domDocument.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ) ; } catch(e) {} -122 -123 editor.window = new CKEDITOR.dom.window( domWindow ); -124 editor.document = new CKEDITOR.dom.document( domDocument ); + 55 var protectEventsRestore = function( html ) + 56 { + 57 return html.replace( protectedEventsRegex, '' ) ; + 58 }; + 59 + 60 // #### protectEvents - END + 61 + 62 CKEDITOR.plugins.add( 'wysiwygarea', + 63 { + 64 init : function( editor, pluginPath ) + 65 { + 66 editor.on( 'editingBlockReady', function() + 67 { + 68 var mainElement, + 69 iframe, + 70 isLoadingData, + 71 isPendingFocus; + 72 + 73 // The following information is needed for IE only. + 74 var isCustomDomain = CKEDITOR.env.ie && document.domain != window.location.hostname; + 75 + 76 // Creates the iframe that holds the editable document. + 77 var createIFrame = function() + 78 { + 79 if ( iframe ) + 80 iframe.remove(); + 81 + 82 iframe = new CKEDITOR.dom.element( 'iframe' ) + 83 .setAttributes({ + 84 frameBorder : 0, + 85 allowTransparency : true }) + 86 .setStyles({ + 87 width : '100%', + 88 height : '100%' }); + 89 + 90 if ( CKEDITOR.env.ie ) + 91 { + 92 if ( isCustomDomain ) + 93 { + 94 // The document domain must be set within the src + 95 // attribute. + 96 iframe.setAttribute( 'src', + 97 'javascript:void( (function(){' + + 98 'document.open();' + + 99 'document.domain="' + document.domain + '";' + +100 'document.write( window.parent._cke_htmlToLoad_' + editor.name + ' );' + +101 'document.close();' + +102 'window.parent._cke_htmlToLoad_' + editor.name + ' = null;' + +103 '})() )' ); +104 } +105 else +106 // To avoid HTTPS warnings. +107 iframe.setAttribute( 'src', 'javascript:void(0)' ); +108 } +109 +110 // Append the new IFRAME to the main element. For IE, it +111 // must be done after setting the "src", to avoid the +112 // "secure/unsecure" message under HTTPS. +113 mainElement.append( iframe ); +114 }; +115 +116 // The script that is appended to the data being loaded. It +117 // enables editing, and makes some +118 var activationScript = +119 '<script id="cke_actscrpt" type="text/javascript">' + +120 'window.onload = function()' + +121 '{' + +122 // Remove this script from the DOM. +123 'var s = document.getElementById( "cke_actscrpt" );' + +124 's.parentNode.removeChild( s );' + 125 -126 editor.fire( 'contentDom' ); -127 -128 isLoadingData = false; -129 -130 if ( isPendingFocus ) -131 editor.focus(); -132 }; -133 -134 editor.addMode( 'wysiwyg', -135 { -136 load : function( holderElement, data, isSnapshot ) -137 { -138 mainElement = holderElement; +126 // Call the temporary function for the editing +127 // boostrap. +128 'window.parent.CKEDITOR.instances.' + editor.name + '._.contentDomReady( window );' + +129 '}' + +130 '</script>'; +131 +132 // Editing area bootstrap code. +133 var contentDomReady = function( domWindow ) +134 { +135 delete editor._.contentDomReady; +136 +137 var domDocument = domWindow.document, +138 body = domDocument.body; 139 -140 // Create the iframe at load for all browsers -141 // except FF and IE with custom domain. -142 if ( !isCustomDomain || !CKEDITOR.env.gecko ) -143 createIFrame(); -144 -145 if ( isSnapshot ) -146 this.loadSnapshotData( data ); -147 else -148 this.loadData( data ); -149 }, -150 -151 loadData : function( data ) -152 { -153 isLoadingData = true; -154 -155 data = -156 CKEDITOR.config.docType + -157 '<html dir="' + CKEDITOR.config.contentLangDirection + '">' + -158 '<head>' + -159 '<link href="' + CKEDITOR.config.contentsCss + '" type="text/css" rel="stylesheet" _fcktemp="true"/>' + -160 '</head>' + -161 '<body>' + -162 editor.dataProcessor.toHtml( data ) + -163 '</body>' + -164 '</html>' + -165 activationScript; -166 -167 // For custom domain in IE, set the global variable -168 // that will temporarily hold the editor data. This -169 // reference will be used in the ifram src. -170 if ( isCustomDomain ) -171 window[ '_cke_htmlToLoad_' + editor.name ] = data; -172 -173 editor._.contentDomReady = contentDomReady; +140 body.spellcheck = !editor.config.disableNativeSpellChecker; +141 +142 if ( CKEDITOR.env.ie ) +143 { +144 // Disable and re-enable the body to avoid IE from +145 // taking the editing focus at startup. (#141 / #523) +146 body.disabled = true; +147 body.contentEditable = true; +148 body.removeAttribute( 'disabled' ); +149 } +150 else +151 domDocument.designMode = 'on'; +152 +153 // IE, Opera and Safari may not support it and throw +154 // errors. +155 try { domDocument.execCommand( 'enableObjectResizing', false, !editor.config.disableObjectResizing ) ; } catch(e) {} +156 try { domDocument.execCommand( 'enableInlineTableEditing', false, !editor.config.disableNativeTableHandles ) ; } catch(e) {} +157 +158 editor.window = new CKEDITOR.dom.window( domWindow ); +159 editor.document = new CKEDITOR.dom.document( domDocument ); +160 +161 editor.fire( 'contentDom' ); +162 +163 isLoadingData = false; +164 +165 if ( isPendingFocus ) +166 editor.focus(); +167 }; +168 +169 editor.addMode( 'wysiwyg', +170 { +171 load : function( holderElement, data, isSnapshot ) +172 { +173 mainElement = holderElement; 174 -175 // We need to recreate the iframe in FF for every -176 // data load, otherwise the following spellcheck -177 // and execCommand features will be active only for -178 // the first time. -179 // The same is valid for IE with custom domain, -180 // because the iframe src must be reset every time. -181 if ( isCustomDomain || CKEDITOR.env.gecko ) -182 createIFrame(); -183 -184 // For custom domain in IE, the data loading is -185 // done through the src attribute of the iframe. -186 if ( !isCustomDomain ) +175 // Create the iframe at load for all browsers +176 // except FF and IE with custom domain. +177 if ( !isCustomDomain || !CKEDITOR.env.gecko ) +178 createIFrame(); +179 +180 if ( isSnapshot ) +181 this.loadSnapshotData( data ); +182 else +183 this.loadData( data ); +184 }, +185 +186 loadData : function( data ) 187 { -188 var doc = iframe.$.contentWindow.document; -189 doc.open(); -190 doc.write( data ); -191 doc.close(); -192 } -193 }, -194 -195 getData : function() -196 { -197 return editor.dataProcessor.toDataFormat( new CKEDITOR.dom.element( iframe.$.contentWindow.document.body ) ); -198 }, -199 -200 getSnapshotData : function() -201 { -202 return iframe.$.contentWindow.document.body.innerHTML; -203 }, -204 -205 loadSnapshotData : function( data ) -206 { -207 iframe.$.contentWindow.document.body.innerHTML = data; -208 }, -209 -210 unload : function( holderElement ) -211 { -212 editor.window = editor.document = iframe = mainElement = isPendingFocus = null; -213 -214 editor.fire( 'contentDomUnload' ); -215 }, -216 -217 focus : function() -218 { -219 if ( isLoadingData ) -220 isPendingFocus = true; -221 else if ( editor.window ) -222 editor.window.focus(); -223 } -224 }); -225 }); -226 } -227 }); -228 -229 /** -230 * Disables the ability of resize objects (image and tables) in the editing -231 * area -232 * @type Boolean -233 * @default false -234 * @example -235 * config.disableObjectResizing = true; -236 */ -237 CKEDITOR.config.disableObjectResizing = false; -238 -239 /** -240 * Disables the "table tools" offered natively by the browser (currently -241 * Firefox only) to make quick table editing operations, like adding or -242 * deleting rows and columns. -243 * @type Boolean -244 * @default true -245 * @example -246 * config.disableNativeTableHandles = false; -247 */ -248 CKEDITOR.config.disableNativeTableHandles = true; -249 -250 /** -251 * Disables the built-in spell checker while typing natively available in the -252 * browser (currently Firefox and Safari only). -253 * -254 * Even if word suggestions will not appear in the FCKeditor context menu, this -255 * feature is useful to help quickly identifying misspelled words. -256 * -257 * This setting is currently compatible with Firefox only due to limitations in -258 * other browsers. -259 * @type Boolean -260 * @default true -261 * @example -262 * config.disableNativeSpellChecker = false; -263 */ -264 CKEDITOR.config.disableNativeSpellChecker = true; -265 +188 isLoadingData = true; +189 +190 // Fix for invalid self-closing tags (see #152). +191 // TODO: Check if this fix is really needed as +192 // soon as we have the XHTML generator. +193 if ( CKEDITOR.env.ie ) +194 data = data.replace( invalidSelfCloseTagsRegex, '$1></$2>' ); +195 +196 // Prevent event attributes (like "onclick") to +197 // execute while editing. +198 if ( CKEDITOR.env.ie || CKEDITOR.env.webkit ) +199 data = protectEvents( data ); +200 +201 data = +202 CKEDITOR.config.docType + +203 '<html dir="' + CKEDITOR.config.contentLangDirection + '">' + +204 '<head>' + +205 '<link href="' + CKEDITOR.config.contentsCss + '" type="text/css" rel="stylesheet" _fcktemp="true"/>' + +206 '</head>' + +207 '<body>' + +208 editor.dataProcessor.toHtml( data ) + +209 '</body>' + +210 '</html>' + +211 activationScript; +212 +213 // For custom domain in IE, set the global variable +214 // that will temporarily hold the editor data. This +215 // reference will be used in the ifram src. +216 if ( isCustomDomain ) +217 window[ '_cke_htmlToLoad_' + editor.name ] = data; +218 +219 editor._.contentDomReady = contentDomReady; +220 +221 // We need to recreate the iframe in FF for every +222 // data load, otherwise the following spellcheck +223 // and execCommand features will be active only for +224 // the first time. +225 // The same is valid for IE with custom domain, +226 // because the iframe src must be reset every time. +227 if ( isCustomDomain || CKEDITOR.env.gecko ) +228 createIFrame(); +229 +230 // For custom domain in IE, the data loading is +231 // done through the src attribute of the iframe. +232 if ( !isCustomDomain ) +233 { +234 var doc = iframe.$.contentWindow.document; +235 doc.open(); +236 doc.write( data ); +237 doc.close(); +238 } +239 }, +240 +241 getData : function() +242 { +243 var data = editor.dataProcessor.toDataFormat( new CKEDITOR.dom.element( iframe.$.contentWindow.document.body ) ); +244 +245 // Restore protected attributes. +246 data = protectEventsRestore( data ); +247 +248 return data; +249 }, +250 +251 getSnapshotData : function() +252 { +253 return iframe.$.contentWindow.document.body.innerHTML; +254 }, +255 +256 loadSnapshotData : function( data ) +257 { +258 iframe.$.contentWindow.document.body.innerHTML = data; +259 }, +260 +261 unload : function( holderElement ) +262 { +263 editor.window = editor.document = iframe = mainElement = isPendingFocus = null; +264 +265 editor.fire( 'contentDomUnload' ); +266 }, +267 +268 focus : function() +269 { +270 if ( isLoadingData ) +271 isPendingFocus = true; +272 else if ( editor.window ) +273 editor.window.focus(); +274 } +275 }); +276 }); +277 } +278 }); +279 })(); +280 +281 /** +282 * Disables the ability of resize objects (image and tables) in the editing +283 * area +284 * @type Boolean +285 * @default false +286 * @example +287 * config.disableObjectResizing = true; +288 */ +289 CKEDITOR.config.disableObjectResizing = false; +290 +291 /** +292 * Disables the "table tools" offered natively by the browser (currently +293 * Firefox only) to make quick table editing operations, like adding or +294 * deleting rows and columns. +295 * @type Boolean +296 * @default true +297 * @example +298 * config.disableNativeTableHandles = false; +299 */ +300 CKEDITOR.config.disableNativeTableHandles = true; +301 +302 /** +303 * Disables the built-in spell checker while typing natively available in the +304 * browser (currently Firefox and Safari only). +305 * +306 * Even if word suggestions will not appear in the FCKeditor context menu, this +307 * feature is useful to help quickly identifying misspelled words. +308 * +309 * This setting is currently compatible with Firefox only due to limitations in +310 * other browsers. +311 * @type Boolean +312 * @default true +313 * @example +314 * config.disableNativeSpellChecker = false; +315 */ +316 CKEDITOR.config.disableNativeSpellChecker = true; +317 Index: /CKEditor/branches/prototype/_source/core/config.js =================================================================== --- /CKEditor/branches/prototype/_source/core/config.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/config.js (revision 2261) @@ -136,5 +136,5 @@ * config.plugins = 'editingblock,toolbar,wysiwygarea'; */ - plugins : 'basicstyles,editingblock,elementspath,htmldataprocessor,sourcearea,toolbar,wysiwygarea', + plugins : 'basicstyles,editingblock,elementspath,htmldataprocessor,selection,sourcearea,toolbar,wysiwygarea', /** Index: /CKEditor/branches/prototype/_source/core/dom/document.js =================================================================== --- /CKEditor/branches/prototype/_source/core/dom/document.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/dom/document.js (revision 2261) @@ -28,4 +28,5 @@ * Represents a DOM document. * @constructor + * @augments CKEDITOR.dom.domObject * @param {Object} domDocument A native DOM document. * @example @@ -34,4 +35,6 @@ CKEDITOR.dom.document = function( domDocument ) { + CKEDITOR.dom.domObject.call( this, domDocument ); + /** * The native DOM document represented by this class instance. @@ -42,112 +45,101 @@ }; -CKEDITOR.dom.document.prototype = -{ - /** - * Appends a CSS file to the document. - * @param {String} cssFileUrl The CSS file URL. - * @example - * CKEDITOR.document.appendStyleSheet( '/mystyles.css' ); - */ - appendStyleSheet : function( cssFileUrl ) +CKEDITOR.dom.document.prototype = new CKEDITOR.dom.domObject(); + +CKEDITOR.tools.extend( CKEDITOR.dom.document.prototype, + /** @lends CKEDITOR.dom.document.prototype */ { - if ( this.$.createStyleSheet ) - this.$.createStyleSheet( cssFileUrl ); - else + /** + * Appends a CSS file to the document. + * @param {String} cssFileUrl The CSS file URL. + * @example + * CKEDITOR.document.appendStyleSheet( '/mystyles.css' ); + */ + appendStyleSheet : function( cssFileUrl ) { - var link = new CKEDITOR.dom.element( 'link' ); - link.setAttributes( + if ( this.$.createStyleSheet ) + this.$.createStyleSheet( cssFileUrl ); + else + { + var link = new CKEDITOR.dom.element( 'link' ); + link.setAttributes( + { + rel :'stylesheet', + type : 'text/css', + href : cssFileUrl + }); + + this.getHead().append( link ); + } + }, + + /** + * Gets and element based on its id. + * @param {String} elementId The element id. + * @returns {CKEDITOR.dom.element} The element instance, or null if not found. + * @example + * var element = CKEDITOR.document.getById( 'myElement' ); + * alert( element.getId() ); // "myElement" + */ + getById : function( elementId ) + { + var $ = this.$.getElementById( elementId ); + return $ ? new CKEDITOR.dom.element( $ ) : null; + }, + + /** + * Gets the <head> element for this document. + * @returns {CKEDITOR.dom.element} The <head> element. + * @example + * var element = CKEDITOR.document.getHead(); + * alert( element.getName() ); // "head" + */ + getHead : function() + { + var head = this.$.getElementsByTagName( 'head' )[0]; + head = new CKEDITOR.dom.element( head ); + + return ( + /** @ignore */ + this.getHead = function() { - rel :'stylesheet', - type : 'text/css', - href : cssFileUrl - }); + return head; + })(); + }, - this.getHead().append( link ); + /** + * Gets the <body> element for this document. + * @returns {CKEDITOR.dom.element} The <body> element. + * @example + * var element = CKEDITOR.document.getBody(); + * alert( element.getName() ); // "body" + */ + getBody : function() + { + var body = new CKEDITOR.dom.element( this.$.body ); + + return ( + /** @ignore */ + this.getBody = function() + { + return body; + })(); + }, + + /** + * Get's the window object that holds this document. + * @returns {CKEDITOR.dom.window} The window object. + * @example + */ + getWindow : function() + { + var win = new CKEDITOR.dom.window( this.$.parentWindow || this.$.defaultView ); + + return ( + /** @ignore */ + this.getWindow = function() + { + return win; + })(); } - }, - - /** - * Determines whether the specified object is equal to the current object. - * @param {Object} object The object to compare with the current object. - * @returns {Boolean} "true" if the object is equal. - * @example - * var doc = new CKEDITOR.dom.document( document ); - * alert( doc.equals( CKEDITOR.document ) ); // "true" - * alert( doc == CKEDITOR.document ); // "false" - */ - equals : function( object ) - { - return ( object && object.$ === this.$ ); - }, - - /** - * Gets and element based on its id. - * @param {String} elementId The element id. - * @returns {CKEDITOR.dom.element} The element instance, or null if not found. - * @example - * var element = CKEDITOR.document.getById( 'myElement' ); - * alert( element.getId() ); // "myElement" - */ - getById : function( elementId ) - { - var $ = this.$.getElementById( elementId ); - return $ ? new CKEDITOR.dom.element( $ ) : null; - }, - - /** - * Gets the <head> element for this document. - * @returns {CKEDITOR.dom.element} The <head> element. - * @example - * var element = CKEDITOR.document.getHead(); - * alert( element.getName() ); // "head" - */ - getHead : function() - { - var head = this.$.getElementsByTagName( 'head' )[0]; - head = new CKEDITOR.dom.element( head ); - - return ( - /** @ignore */ - this.getHead = function() - { - return head; - })(); - }, - - /** - * Gets the <body> element for this document. - * @returns {CKEDITOR.dom.element} The <body> element. - * @example - * var element = CKEDITOR.document.getBody(); - * alert( element.getName() ); // "body" - */ - getBody : function() - { - var body = new CKEDITOR.dom.element( this.$.body ); - - return ( - /** @ignore */ - this.getBody = function() - { - return body; - })(); - }, - - /** - * Get's the window object that holds this document. - * @returns {CKEDITOR.dom.window} The window object. - * @example - */ - getWindow : function() - { - var win = new CKEDITOR.dom.window( this.$.parentWindow || this.$.defaultView ); - - return ( - /** @ignore */ - this.getWindow = function() - { - return win; - })(); - } -}; + }); Index: /CKEditor/branches/prototype/_source/core/dom/domobject.js =================================================================== --- /CKEditor/branches/prototype/_source/core/dom/domobject.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/dom/domobject.js (revision 2261) @@ -38,7 +38,4 @@ if ( nativeDomObject ) { - // Call the base event constructor. - CKEDITOR.event.call( this ); - /** * The native DOM object represented by this class instance. @@ -49,4 +46,12 @@ */ this.$ = nativeDomObject; + + // Get the main private function from the custom data. Create it if not + // defined. + if ( !( this._ = this.getCustomData( '_' ) ) ) + this.setCustomData( '_', ( this._ = {} ) ); + + // Call the base event constructor. + CKEDITOR.event.call( this ); } }; @@ -120,4 +125,20 @@ { var customData = {}; + + /** + * Determines whether the specified object is equal to the current object. + * @name CKEDITOR.dom.domObject.prototype.equals + * @function + * @param {Object} object The object to compare with the current object. + * @returns {Boolean} "true" if the object is equal. + * @example + * var doc = new CKEDITOR.dom.document( document ); + * alert( doc.equals( CKEDITOR.document ) ); // "true" + * alert( doc == CKEDITOR.document ); // "false" + */ + domObjectProto.equals = function( object ) + { + return ( object && object.$ === this.$ ); + }, /** @@ -125,4 +146,5 @@ * instances pointing to that same DOM object. * @name CKEDITOR.dom.domObject.prototype.setCustomData + * @function * @param {String} key A key used to identify the data slot. * @param {Object} value The value to set to the data slot. @@ -146,4 +168,5 @@ * Gets the value set to a data slot in this object. * @name CKEDITOR.dom.domObject.prototype.getCustomData + * @function * @param {String} key The key used to identify the data slot. * @returns {Object} This value set to the data slot. Index: /CKEditor/branches/prototype/_source/core/dom/node.js =================================================================== --- /CKEditor/branches/prototype/_source/core/dom/node.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/dom/node.js (revision 2261) @@ -84,4 +84,18 @@ return element; }, + + /** + * Gets the parent element for this node. + * @returns {CKEDITOR.dom.element} The parent element. + * @example + * var node = editor.document.getBody().getFirst(); + * var parent = node.getParent(); + * alert( node.getName() ); // "body" + */ + getParent : function() + { + var parent = this.$.parentNode; + return parent ? new CKEDITOR.dom.element( this.$.parentNode ) : null; + }, /** Index: /CKEditor/branches/prototype/_source/core/loader.js =================================================================== --- /CKEditor/branches/prototype/_source/core/loader.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/loader.js (revision 2261) @@ -42,5 +42,5 @@ 'core/_bootstrap' : [ 'core/config', 'core/ckeditor', 'core/plugins', 'core/scriptLoader', 'core/tools', /* The following are entries that we wnat to force loading to at the end to avoid dependence recursion */ 'core/dom/text' ], 'core/ajax' : [ 'core/xml' ], - 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/tools' ], + 'core/ckeditor' : [ 'core/ajax', 'core/ckeditor_basic', 'core/dom', 'core/dom/document', 'core/dom/element', 'core/editor', 'core/event', 'core/listslib', 'core/tools' ], 'core/ckeditor_base' : [], 'core/ckeditor_basic' : [ 'core/env', 'core/event' ], @@ -57,4 +57,5 @@ 'core/env' : [], 'core/event' : [], + 'core/listslib' : [], 'core/plugins' : [ 'core/resourceManager' ], 'core/resourceManager' : [ 'core/scriptLoader', 'core/tools' ], Index: /CKEditor/branches/prototype/_source/core/resourcemanager.js =================================================================== --- /CKEditor/branches/prototype/_source/core/resourcemanager.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/resourcemanager.js (revision 2261) @@ -93,5 +93,5 @@ * Registers a resource. * @param {String} name The resource name. - * @param {Object} definition The resource definition. + * @param {Object} [definition] The resource definition. * @example * CKEDITOR.plugins.add( 'sample', { ... plugin definition ... } ); @@ -103,5 +103,5 @@ throw '[CKEDITOR.resourceManager.add] The resource name "' + name + '" is already registered.'; - this.registered[ name ] = definition; + this.registered[ name ] = definition || {}; }, Index: /CKEditor/branches/prototype/_source/core/tools.js =================================================================== --- /CKEditor/branches/prototype/_source/core/tools.js (revision 2260) +++ /CKEditor/branches/prototype/_source/core/tools.js (revision 2261) @@ -173,4 +173,7 @@ * progressive numbers starting at 1. * @returns {Number} A unique number. + * @example + * alert( CKEDITOR.tools.getNextNumber() ); // "1" (e.g.) + * alert( CKEDITOR.tools.getNextNumber() ); // "2" */ getNextNumber : (function() @@ -181,4 +184,43 @@ return ++last; }; - })() + })(), + + /** + * Executes a function after specified delay. + * @param {Function} func The function to be executed. + * @param {Number} [milliseconds] The amount of time (millisecods) to wait + * to fire the function execution. Defaults to zero. + * @param {Object} [scope] The object to hold the function execution scope + * (the "this" object). By default the "window" object. + * @param {Object|Array} [args] A single object, or an array of objects, to + * pass as arguments to the function. + * @param {Object} [ownerWindow] The window that will be used to set the + * timeout. By default the current "window". + * @returns {Object} A value that can be used to cancel the function execution. + * @example + * CKEDITOR.tools.setTimeout( + * function() + * { + * alert( 'Executed after 2 seconds' ); + * }, + * 2000 ); + */ + setTimeout : function( func, milliseconds, scope, args, ownerWindow ) + { + if ( !ownerWindow ) + ownerWindow = window; + + if ( !scope ) + scope = ownerWindow; + + return ownerWindow.setTimeout( + function() + { + if ( args ) + func.apply( scope, [].concat( args ) ) ; + else + func.apply( scope ) ; + }, + milliseconds || 0 ); + } }; Index: /CKEditor/branches/prototype/_source/plugins/selection/plugin.js =================================================================== --- /CKEditor/branches/prototype/_source/plugins/selection/plugin.js (revision 2261) +++ /CKEditor/branches/prototype/_source/plugins/selection/plugin.js (revision 2261) @@ -0,0 +1,337 @@ +/* + * 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 == + */ + +(function() +{ + // #### checkSelectionChange : START + + // The selection change check basically saves the element parent tree of + // the current node and check it on successive requests. If there is any + // change on the tree, then the selectionChange event gets fired. + var checkSelectionPreviousPath; + var checkSelectionChange = function() + { + // In IE, the "selectionchange" event may still get thrown when + // releasing the WYSIWYG mode, so we need to check it first. + var sel = this.getSelection(); + if ( !sel ) + return; + + // Get the element at the start of the selection. + var node = this.getSelection().getStartElement(), + changed, + currentPath = [], + counter = 0; + + // Loops through the parent tree of the main node. + while( node ) + { + // Look for changes in the parent node tree. + if ( !changed && ( !checkSelectionPreviousPath || !node.equals( checkSelectionPreviousPath[ counter++ ] ) ) ) + changed = true; + + currentPath.push( node ); + node = node.getParent(); + } + + checkSelectionPreviousPath = currentPath; + + if ( changed ) + this.fire( 'selectionChange' ); + }; + + var checkSelectionChangeTimer; + var checkSelectionChangeTimeout = function() + { + if ( checkSelectionChangeTimer ) + clearTimeout( checkSelectionChangeTimer ); + + checkSelectionChangeTimer = CKEDITOR.tools.setTimeout( checkSelectionChange, 100, this ); + }; + + // #### checkSelectionChange : END + + CKEDITOR.plugins.add( 'selection', + { + init : function( editor, pluginPath ) + { + editor.on( 'contentDom', function() + { + if ( CKEDITOR.env.ie ) + { + // IE is the only to provide the "selectionchange" + // event. + editor.document.on( 'selectionchange', checkSelectionChange, editor ); + } + else + { + // In other browsers, we make the selection change + // check based on other events, like clicks or keys + // press. + + editor.document.on( 'mouseup', checkSelectionChange, editor ); + + // Firing the "OnSelectionChange" event on every key + // press started to be too slow. So, a timer has been + // implemented to solve performance issues when typing + // to quickly. + editor.document.on( 'keyup', checkSelectionChangeTimeout, editor ); + } + }); + } + }); +})(); + +/** + * Gets the current selection from the editing area when in WYSIWYG mode. + * @returns {CKEDITOR.dom.selection} A selection object or null if not on + * WYSIWYG mode or no selection is available. + * @example + * var selection = CKEDITOR.instances.editor1.getSelection(); + * alert( selection.getType() ); + */ +CKEDITOR.editor.prototype.getSelection = function() +{ + return this.document ? this.document.getSelection() : null; +}; + +/** + * Gets the current selection from the document. + * @returns {CKEDITOR.dom.selection} A selection object. + * @example + * var selection = CKEDITOR.instances.editor1.document.getSelection(); + * alert( selection.getType() ); + */ +CKEDITOR.dom.document.prototype.getSelection = function() +{ + return new CKEDITOR.dom.selection( this ); +}; + +/** + * No selection. + * @constant + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_NONE ) + * alert( 'Nothing is selected' ); + */ +CKEDITOR.SELECTION_NONE = 1; + +/** + * Text or collapsed selection. + * @constant + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT ) + * alert( 'Text is selected' ); + */ +CKEDITOR.SELECTION_TEXT = 2; + +/** + * Element selection. + * @constant + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_ELEMENT ) + * alert( 'An element is selected' ); + */ +CKEDITOR.SELECTION_ELEMENT = 3; + +/** + * Manipulates the selection in a DOM document. + * @constructor + * @example + */ +CKEDITOR.dom.selection = function( document ) +{ + this.document = document; +}; + +(function() +{ + var styleObjectElements = { img:1,hr:1,li:1,table:1,tr:1,td:1,embed:1,object:1,ol:1,ul:1 }; + + CKEDITOR.dom.selection.prototype = + { + /** + * Gets the native selection object from the browser. + * @returns {Object} The native selection object. + * @example + * 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(); + }; + })(), + + /** + * Gets the type of the current selection. The following values are + * available: + *

{@link CKEDITOR.SELECTION_NONE} (1): No selection.
{@link CKEDITOR.SELECTION_TEXT} (2): Text is selected or + * collapsed selection.
{@link CKEDITOR.SELECTION_ELEMENT} (3): A element + * selection.

+ * @returns {Number} One of the following constant values: + * {@link CKEDITOR.SELECTION_NONE}, {@link CKEDITOR.SELECTION_TEXT} or + * {@link CKEDITOR.SELECTION_ELEMENT}. + * @example + * if ( editor.getSelection().getType() == CKEDITOR.SELECTION_TEXT ) + * alert( 'Text is selected' ); + */ + getType : (function() + { + if ( CKEDITOR.env.ie ) + return 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; + }; + 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; + }; + })(), + + /** + * Gets the DOM element in which the selection starts. + * @returns {CKEDITOR.dom.element} The element at the beginning of the + * selection. + * @example + * var element = editor.getSelection().getStartElement(); + * alert( element.getName() ); + */ + getStartElement : function() + { + var node, + sel = this.getNative(); + + switch ( this.getType() ) + { + case CKEDITOR.SELECTION_ELEMENT : + return this.getSelectedElement(); + + case CKEDITOR.SELECTION_TEXT : + + if ( CKEDITOR.env.ie ) + { + var range = sel.createRange(); + range.collapse( true ); + + node = range.parentElement(); + } + else + { + node = sel.anchorNode; + + if ( node.nodeType != 1 ) + node = node.parentNode; + } + } + + return ( node ? new CKEDITOR.dom.element( node ) : null ); + }, + + /** + * Gets the current selected element. + * @returns {CKEDITOR.dom.element} The selected element. Null if no + * selection is available or the selection type is not + * {@link CKEDITOR.SELECTION_ELEMENT}. + * @example + * var element = editor.getSelection().getSelectedElement(); + * alert( element.getName() ); + */ + getSelectedElement : function() + { + var node; + + if ( this.getType() == CKEDITOR.SELECTION_ELEMENT ) + { + var sel = this.getNative(); + + if ( CKEDITOR.env.ie ) + { + try + { + node = sel.createRange().item(0); + } + catch(e) {} + } + else + { + var range = sel.getRangeAt( 0 ); + node = range.startContainer.childNodes[ range.startOffset ]; + } + } + + return ( node ? new CKEDITOR.dom.element( node ) : null ); + } + }; +})();