Index: CKEditor/trunk/_dev/docs_build/template/publish.js =================================================================== --- CKEditor/trunk/_dev/docs_build/template/publish.js (revision 6348) +++ CKEditor/trunk/_dev/docs_build/template/publish.js (revision 6350) @@ -1,3 +1,3 @@ -/** Called automatically by JsDoc Toolkit. */ +/** Called automatically by JsDoc Toolkit. */ function publish(symbolSet) { publish.conf = { // trailing slash expected for dirs Index: CKEditor/trunk/_samples/ajax.html =================================================================== --- CKEditor/trunk/_samples/ajax.html (revision 6348) +++ CKEditor/trunk/_samples/ajax.html (revision 6350) @@ -64,5 +64,5 @@
- +- This sample shows how to use the + This sample shows how to use the CKEditor JavaScript API to interact with the editor at runtime. Index: CKEditor/trunk/_samples/api_dialog.html =================================================================== --- CKEditor/trunk/_samples/api_dialog.html (revision 6348) +++ CKEditor/trunk/_samples/api_dialog.html (revision 6350) @@ -112,5 +112,5 @@
- This sample shows how to use the + This sample shows how to use the CKEditor Dialog API to customize CKEditor dialog windows without changing the original editor code. @@ -131,6 +131,6 @@
- This sample shows how to configure CKEditor instances to use the + This sample shows how to configure CKEditor instances to use the autogrow plugin that lets the editor window expand and shrink depending on the amount and size of content entered in the editing area. @@ -32,10 +32,10 @@
It is also possible to set a maximum height for the editor window. Once CKEditor
- editing area reaches the value in pixels specified in the autoGrow_maxHeight
+ editing area reaches the value in pixels specified in the autoGrow_maxHeight
attribute, scrollbars will be added and the editor window will no longer expand.
-
To add a CKEditor instance using the autogrow plugin and its
- autoGrow_maxHeight
attribute, insert the following JavaScript call to your code:
+ autoGrow_maxHeight
attribute, insert the following JavaScript call to your code:
CKEDITOR.replace( 'textarea_id', Index: CKEditor/trunk/_samples/divreplace.html =================================================================== --- CKEditor/trunk/_samples/divreplace.html (revision 6348) +++ CKEditor/trunk/_samples/divreplace.html (revision 6350) @@ -76,5 +76,5 @@- CKEditor Sample — Replace DIV with CKEditor on the Fly + CKEditor Sample — Replace DIV with CKEditor on the Fly
Index: CKEditor/trunk/_samples/enterkey.html =================================================================== --- CKEditor/trunk/_samples/enterkey.html (revision 6348) +++ CKEditor/trunk/_samples/enterkey.html (revision 6350) @@ -45,7 +45,7 @@- +- This sample shows how to configure the Enter and Shift+Enter keys - to perform actions specified in the -
-enterMode
+ This sample shows how to configure the Enter and Shift+Enter keys + to perform actions specified in the +enterMode
andshiftEnterMode
parameters, respectively. Index: CKEditor/trunk/_samples/fullpage.html =================================================================== --- CKEditor/trunk/_samples/fullpage.html (revision 6348) +++ CKEditor/trunk/_samples/fullpage.html (revision 6350) @@ -25,6 +25,6 @@<html>
tag to the</html>
tag.- CKEditor is inserted with a JavaScript call using the following code: +
+ CKEditor is inserted with a JavaScript call using the following code:
CKEDITOR.replace( 'textarea_id', @@ -37,5 +37,5 @@Index: CKEditor/trunk/_samples/index.html =================================================================== --- CKEditor/trunk/_samples/index.html (revision 6348) +++ CKEditor/trunk/_samples/index.html (revision 6350) @@ -51,8 +51,8 @@
- Replace DIV elements on the fly
- Transforming adiv
element into an instance of CKEditor with a mouse click. + Transforming adiv
element into an instance of CKEditor with a mouse click.- Create and destroy editor instances for Ajax applications
- Creating and destroying CKEditor instances on the fly and saving the contents entered into the editor window. + Creating and destroying CKEditor instances on the fly and saving the contents entered into the editor window.- Basic usage of the API
@@ -63,5 +63,5 @@- Using the "Enter" key in CKEditor
- Configuring the behavior of Enter and Shift+Enter keys. + Configuring the behavior of Enter and Shift+Enter keys.- Shared toolbars
@@ -78,5 +78,5 @@- Output for Flash
- Configuring CKEditor to produce HTML code that can be used with Adobe Flash. + Configuring CKEditor to produce HTML code that can be used with Adobe Flash.- Placeholder plugin
Index: CKEditor/trunk/_samples/jqueryadapter.html =================================================================== --- CKEditor/trunk/_samples/jqueryadapter.html (revision 6348) +++ CKEditor/trunk/_samples/jqueryadapter.html (revision 6350) @@ -45,5 +45,5 @@- +- This sample shows how to load CKEditor and configure it using the + This sample shows how to load CKEditor and configure it using the jQuery adapter. In this case the jQuery adapter is responsible for transforming a
<textarea>
@@ -51,6 +51,6 @@- CKEditor instance with custom configuration set in jQuery can be inserted with the - following JavaScript code: + CKEditor instance with custom configuration set in jQuery can be inserted with the + following JavaScript code:
$(function() @@ -68,5 +68,5 @@Index: CKEditor/trunk/_samples/output_for_flash.html =================================================================== --- CKEditor/trunk/_samples/output_for_flash.html (revision 6348) +++ CKEditor/trunk/_samples/output_for_flash.html (revision 6350) @@ -38,5 +38,5 @@- This sample shows how to configure CKEditor to output + This sample shows how to configure CKEditor to output HTML code that can be used with Index: CKEditor/trunk/_samples/output_html.html =================================================================== --- CKEditor/trunk/_samples/output_html.html (revision 6348) +++ CKEditor/trunk/_samples/output_html.html (revision 6350) @@ -33,5 +33,5 @@
- A snippet of the configuration code can be seen below; check the source of this page for + A snippet of the configuration code can be seen below; check the source of this page for full definition:
@@ -46,5 +46,5 @@ attributes : { 'size' : '#(size)' } } - + // More definitions follow. }); Index: CKEditor/trunk/_samples/output_xhtml.html =================================================================== --- CKEditor/trunk/_samples/output_xhtml.html (revision 6348) +++ CKEditor/trunk/_samples/output_xhtml.html (revision 6350) @@ -32,5 +32,5 @@- A snippet of the configuration code can be seen below; check the source of this page for + A snippet of the configuration code can be seen below; check the source of this page for full definition:
Index: CKEditor/trunk/_samples/php/events.php =================================================================== --- CKEditor/trunk/_samples/php/events.php (revision 6348) +++ CKEditor/trunk/_samples/php/events.php (revision 6350) @@ -19,5 +19,5 @@- A snippet of the configuration code can be seen below; check the source code of this page for + A snippet of the configuration code can be seen below; check the source code of this page for the full definition:
Index: CKEditor/trunk/_samples/php/replace.php =================================================================== --- CKEditor/trunk/_samples/php/replace.php (revision 6348) +++ CKEditor/trunk/_samples/php/replace.php (revision 6350) @@ -12,5 +12,5 @@- CKEditor Sample — Replace Selected Textarea Elements Using PHP Code + CKEditor Sample — Replace Selected Textarea Elements Using PHP Code
@@ -21,5 +21,5 @@To replace a
<textarea>
element, place the following call at any point - after the<textarea>
element: + after the<textarea>
element:Index: CKEditor/trunk/_samples/php/replaceall.php =================================================================== --- CKEditor/trunk/_samples/php/replaceall.php (revision 6348) +++ CKEditor/trunk/_samples/php/replaceall.php (revision 6350) @@ -21,5 +21,5 @@To replace all
<textarea>
elements, place the following call at any point - after the last<textarea>
element: + after the last<textarea>
element:Index: CKEditor/trunk/_samples/php/standalone.php =================================================================== --- CKEditor/trunk/_samples/php/standalone.php (revision 6348) +++ CKEditor/trunk/_samples/php/standalone.php (revision 6350) @@ -19,5 +19,5 @@-<?php +<?php include_once "ckeditor/ckeditor.php"; Index: CKEditor/trunk/_samples/placeholder.html =================================================================== --- CKEditor/trunk/_samples/placeholder.html (revision 6348) +++ CKEditor/trunk/_samples/placeholder.html (revision 6350) @@ -22,5 +22,5 @@- +- This sample shows how to configure CKEditor instances to use the + This sample shows how to configure CKEditor instances to use the placeholder plugin that lets you insert read-only elements into your content. To enter and modify read-only text, use the @@ -30,5 +30,5 @@ To add a CKEditor instance that uses the placeholder plugin and a related Create Placeholder toolbar button, insert the following JavaScript - call to your code: + call to your code:
CKEDITOR.replace( 'textarea_id', Index: CKEditor/trunk/_samples/replacebyclass.html =================================================================== --- CKEditor/trunk/_samples/replacebyclass.html (revision 6348) +++ CKEditor/trunk/_samples/replacebyclass.html (revision 6350) @@ -27,5 +27,5 @@To replace a
<textarea>
element, simply assign it theckeditor
- class, as in the code below: + class, as in the code below:<textarea class="ckeditor" name="editor1"></textarea>@@ -34,5 +34,5 @@Index: CKEditor/trunk/_samples/replacebycode.html =================================================================== --- CKEditor/trunk/_samples/replacebycode.html (revision 6348) +++ CKEditor/trunk/_samples/replacebycode.html (revision 6350) @@ -18,5 +18,5 @@- CKEditor Sample — Replace Textarea Elements Using JavaScript Code + CKEditor Sample — Replace Textarea Elements Using JavaScript Code
@@ -28,5 +28,5 @@ To replace a- +<textarea>
element, place the following call at any point after the<textarea>
element or inside a<script>
element located - in the<head>
section of the page, in awindow.onload
event handler: + in the<head>
section of the page, in awindow.onload
event handler:CKEDITOR.replace( 'textarea_id' );@@ -36,5 +36,5 @@Index: CKEditor/trunk/_samples/sample.css =================================================================== --- CKEditor/trunk/_samples/sample.css (revision 6348) +++ CKEditor/trunk/_samples/sample.css (revision 6350) @@ -12,5 +12,5 @@ body { - padding:10px 30px; + padding:10px 30px; } @@ -179,2 +179,7 @@ } +.cke_dialog label +{ + display: inline; + margin-bottom: auto; +} Index: CKEditor/trunk/_samples/sample.js =================================================================== --- CKEditor/trunk/_samples/sample.js (revision 6348) +++ CKEditor/trunk/_samples/sample.js (revision 6350) @@ -1,3 +1,3 @@ -ï»?* +/* Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: CKEditor/trunk/_samples/sample_posteddata.php =================================================================== --- CKEditor/trunk/_samples/sample_posteddata.php (revision 6348) +++ CKEditor/trunk/_samples/sample_posteddata.php (revision 6350) @@ -7,6 +7,6 @@ We are sorry, but your Web server does not support the PHP language used in this script. - Please note that CKEditor can be used with any other server-side language than just PHP. - To save the content created with CKEditor you need to read the POST data on the server + Please note that CKEditor can be used with any other server-side language than just PHP. + To save the content created with CKEditor you need to read the POST data on the server side and write it to a file or a database. Index: CKEditor/trunk/_samples/sharedspaces.html =================================================================== --- CKEditor/trunk/_samples/sharedspaces.html (revision 6348) +++ CKEditor/trunk/_samples/sharedspaces.html (revision 6350) @@ -39,5 +39,5 @@- +- CKEditor instances with shared spaces can be inserted with a JavaScript call using the following code: + CKEditor instances with shared spaces can be inserted with a JavaScript call using the following code:
CKEDITOR.replace( 'textarea_id', Index: CKEditor/trunk/_samples/skins.html =================================================================== --- CKEditor/trunk/_samples/skins.html (revision 6348) +++ CKEditor/trunk/_samples/skins.html (revision 6350) @@ -26,5 +26,5 @@- CKEditor with a specified skin (in this case, the "Office 2003" skin) is inserted with a JavaScript call using the following code: + CKEditor with a specified skin (in this case, the "Office 2003" skin) is inserted with a JavaScript call using the following code:
CKEDITOR.replace( 'textarea_id', @@ -37,5 +37,5 @@Index: CKEditor/trunk/_samples/ui_color.html =================================================================== --- CKEditor/trunk/_samples/ui_color.html (revision 6348) +++ CKEditor/trunk/_samples/ui_color.html (revision 6350) @@ -27,5 +27,5 @@Setting the User Interface Color
- To specify the color of the user interface, set the
uiColor
property: + To specify the color of the user interface, set theuiColor
property:CKEDITOR.replace( 'textarea_id', @@ -41,9 +41,9 @@ If the uicolor plugin along with the dedicated UIColor toolbar button is added to CKEditor, the user will also be able to pick the color of the - UI from the color palette available in the UI Color Picker dialog window. + UI from the color palette available in the UI Color Picker dialog window.To insert a CKEditor instance with the uicolor plugin enabled, - use the following JavaScript call: + use the following JavaScript call:
CKEDITOR.replace( 'textarea_id', Index: CKEditor/trunk/_samples/ui_languages.html =================================================================== --- CKEditor/trunk/_samples/ui_languages.html (revision 6348) +++ CKEditor/trunk/_samples/ui_languages.html (revision 6350) @@ -40,6 +40,6 @@- To specify the user interface language that will be used no matter what language is - specified in user's browser or operating system, set the
language
property: + To specify the user interface language that will be used no matter what language is + specified in user's browser or operating system, set thelanguage
property:CKEDITOR.replace( 'textarea_id', Index: CKEditor/trunk/_source/core/htmlparser/element.js =================================================================== --- CKEditor/trunk/_source/core/htmlparser/element.js (revision 6348) +++ CKEditor/trunk/_source/core/htmlparser/element.js (revision 6350) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: CKEditor/trunk/_source/plugins/indent/plugin.js =================================================================== --- CKEditor/trunk/_source/plugins/indent/plugin.js (revision 6348) +++ CKEditor/trunk/_source/plugins/indent/plugin.js (revision 6350) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: CKEditor/trunk/_source/plugins/selection/plugin.js =================================================================== --- CKEditor/trunk/_source/plugins/selection/plugin.js (revision 6348) +++ CKEditor/trunk/_source/plugins/selection/plugin.js (revision 6350) @@ -1,3 +1,3 @@ -/* +/* Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: CKEditor/trunk/ckeditor_basic_source.js =================================================================== --- CKEditor/trunk/ckeditor_basic_source.js (revision 6348) +++ CKEditor/trunk/ckeditor_basic_source.js (revision 6350) @@ -1,3 +1,3 @@ -ï»?* +/* Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: CKEditor/trunk/ckeditor_source.js =================================================================== --- CKEditor/trunk/ckeditor_source.js (revision 6348) +++ CKEditor/trunk/ckeditor_source.js (revision 6350) @@ -1,3 +1,3 @@ -ï»?* +/* Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license Index: CKEditor/trunk/config.js =================================================================== --- CKEditor/trunk/config.js (revision 6348) +++ CKEditor/trunk/config.js (revision 6350) @@ -7,9 +7,5 @@ { // Define changes to default configuration here. For example: -// config.language = 'he'; + // config.language = 'fr'; // config.uiColor = '#AADC6E'; -// config.extraPlugins ='bbcode'; - config.enterMode = 2; -// config.entities = false; - config.fontSize_sizes = "30/30%;50/50%;100/100%;120/120%;150/150%;200/200%;300/300%"; };