Index: /CKEditor/branches/versions/3.1.x/_dev/docs_build/docs_build.bat =================================================================== --- /CKEditor/branches/versions/3.1.x/_dev/docs_build/docs_build.bat (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_dev/docs_build/docs_build.bat (revision 4882) @@ -1,5 +1,5 @@ @ECHO OFF :: -:: Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +:: Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. :: For licensing, see LICENSE.html or http://ckeditor.com/license :: Index: /CKEditor/branches/versions/3.1.x/_dev/docs_build/template/static/footer.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_dev/docs_build/template/static/footer.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_dev/docs_build/template/static/footer.html (revision 4882) @@ -1,3 +1,3 @@

- This sample shows how to use the dialog API to customize dialogs whithout changing - the original editor code. The following customizations are being done::

Add dialog pages ("My Tab" in the Link dialog).
Remove a dialog tab ("Target" tab from the Link dialog).
Add dialog fields ("My Custom Field" into the Link dialog).
Remove dialog fields ("Link Type" and "Browser Server" the Link dialog).
Set default values for dialog fields (for the "URL" field in the - Link dialog).
Create a custom dialog ("My Dialog" button).

- - + + Index: /CKEditor/branches/versions/3.1.x/_samples/api_dialog/my_dialog.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/api_dialog/my_dialog.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/api_dialog/my_dialog.js (revision 4882) @@ -1,4 +1,4 @@ -/* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +/* +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_samples/divreplace.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/divreplace.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/divreplace.html (revision 4882) @@ -1,5 +1,5 @@ @@ -7,4 +7,12 @@ Replace DIV - CKEditor Sample + + + + + + - - + -

+ CKEditor Sample +

+ +

+ CKEditor requires JavaScript to run. In a browser with no JavaScript + support, like yours, you should still see the contents (HTML data) and you should + be able to edit it normally, without a rich editor interface. +

+ Double-click on any of the following DIVs to transform them into editor instances.

+ Part 1

- Double-click on any of the following DIVs to transform them into editor instances.

- Part 1

- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi - semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna - rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla - nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce - eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus. -

- Part 2

- Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus - sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum - vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate. -

- Part 3

+ Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Cras et ipsum quis mi + semper accumsan. Integer pretium dui id massa. Suspendisse in nisl sit amet urna + rutrum imperdiet. Nulla eu tellus. Donec ante nisi, ullamcorper quis, fringilla + nec, sagittis eleifend, pede. Nulla commodo interdum massa. Donec id metus. Fusce + eu ipsum. Suspendisse auctor. Phasellus fermentum porttitor risus. +

+ Part 2

+ Donec velit. Mauris massa. Vestibulum non nulla. Nam suscipit arcu nec elit. Phasellus + sollicitudin iaculis ante. Ut non mauris et sapien tincidunt adipiscing. Vestibulum + vitae leo. Suspendisse nec mi tristique nulla laoreet vulputate. +

+ Part 3

+ Index: /CKEditor/branches/versions/3.1.x/_samples/enterkey.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/enterkey.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/enterkey.html (revision 4882) @@ -1,5 +1,5 @@ @@ -7,6 +7,13 @@ ENTER Key Configuration - CKEditor Sample - - + + + + + + + + + + -

- -

+ //]]> + +

+ +

+ + Index: /CKEditor/branches/versions/3.1.x/_samples/index.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/index.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/index.html (revision 4882) @@ -1,5 +1,5 @@ @@ -47,5 +47,5 @@

Index: /CKEditor/branches/versions/3.1.x/_samples/jqueryadapter.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/jqueryadapter.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/jqueryadapter.html (revision 4882) @@ -1,5 +1,5 @@ @@ -7,61 +7,71 @@ jQuery adapter - CKEditor Sample + - + CKReleaser %REMOVE_START% --> - + + + -

+ CKEditor Sample +

+ +

- - Editor 1:
- + CKEditor requires JavaScript to run. In a browser with no JavaScript + support, like yours, you should still see the contents (HTML data) and you should + be able to edit it normally, without a rich editor interface. - -

-<script type="text/javascript">
-	$( function()
-	{
-		$( '.jquery_ckeditor' ).ckeditor();
-	} );
-</script>
-

-<form action="">
-  <p>
-    <label for="editor1">
-      Editor 1:</label><br />
-    <textarea id="editor1" name="editor1" class="jquery_ckeditor" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">CKEditor</a>.</p></textarea>
-  </p>
-  <p>
-</form>
-

+ + +

+ + Editor 1:
+ This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. +

+ +

+ + Index: /CKEditor/branches/versions/3.1.x/_samples/php/advanced.php =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/php/advanced.php (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/php/advanced.php (revision 4882) @@ -1,5 +1,5 @@ @@ -35,5 +35,5 @@ include("../../ckeditor.php"); -// Create class instance. +// Create class instance. $CKEditor = new CKEditor(); @@ -80,10 +80,11 @@ Index: /CKEditor/branches/versions/3.1.x/_samples/php/events.php =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/php/events.php (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/php/events.php (revision 4882) @@ -1,5 +1,5 @@ @@ -65,5 +65,5 @@ include("../../ckeditor.php"); -// Create class instance. +// Create class instance. $CKEditor = new CKEditor(); @@ -117,10 +117,11 @@ Index: /CKEditor/branches/versions/3.1.x/_samples/php/replace.php =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/php/replace.php (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/php/replace.php (revision 4882) @@ -1,5 +1,5 @@ @@ -39,10 +39,11 @@ Index: /CKEditor/branches/versions/3.1.x/_samples/php/replaceall.php =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/php/replaceall.php (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/php/replaceall.php (revision 4882) @@ -1,5 +1,5 @@ @@ -44,10 +44,11 @@ Index: /CKEditor/branches/versions/3.1.x/_samples/php/standalone.php =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/php/standalone.php (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/php/standalone.php (revision 4882) @@ -1,5 +1,5 @@ @@ -52,10 +52,11 @@ Index: /CKEditor/branches/versions/3.1.x/_samples/replacebyclass.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/replacebyclass.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/replacebyclass.html (revision 4882) @@ -1,5 +1,5 @@ - + @@ -7,37 +7,46 @@ Replace Textareas by Class Name - CKEditor Sample - + + + + + + -

+ CKEditor Sample +

+ +

-<form action="">
-  <p>
-    <label for="editor1">
-      Editor 1:</label><br />
-    <textarea id="editor1" name="editor1" class="ckeditor" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p></textarea>
-  </p>
-  <p>
-    <label for="editor2">
-      Editor 2:</label><br />
-    <textarea id="editor2" name="editor2" class="ckeditor" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p></textarea>
-  </p>
-  <p>
-    <input type="submit" value="Submit" />
-  </p>
-</form>
-

+ +

+ + Editor 1:
+ This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. +

+ +

+ + Index: /CKEditor/branches/versions/3.1.x/_samples/replacebycode.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/replacebycode.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/replacebycode.html (revision 4882) @@ -1,5 +1,5 @@ @@ -7,70 +7,77 @@ Replace Textarea by Code - CKEditor Sample - + + + + + + -

- -

-<form action="">
-  <p>
-    <label for="editor1">
-      Editor 1:</label><br />
-    <textarea name="editor1" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p></textarea>
-    <script type="text/javascript">
-    //<![CDATA[
-
-      CKEDITOR.replace( 'editor1' );
-
-    //]]>
-    </script>
-  </p>
-  <p>
-    <input type="submit" value="Submit" />
-  </p>
-</form>
-

+ //]]> + +

+ +

+ + Index: /CKEditor/branches/versions/3.1.x/_samples/sample.css =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/sample.css (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/sample.css (revision 4882) @@ -1,4 +1,4 @@ -/* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +/* +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: Editor/branches/versions/3.1.x/_samples/sample.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/sample.html (revision 4881) +++ (revision ) @@ -1,82 +1,0 @@ - - - - - Sample - CKEditor - - - - - - - - - - - - -

- CKEditor Sample -

- -

- CKEditor requires JavaScript to run. In a browser with no JavaScript - support, like yours, you should still see the contents (HTML data) and you should - be able to edit it normally, without a rich editor interface. -

- - - - - Index: /CKEditor/branches/versions/3.1.x/_samples/sample.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/sample.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/sample.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -7,76 +7,7 @@ // It is just a helper file that displays a red message about browser compatibility // at the top of the samples (if incompatible browser is detected). -// %REMOVE_START% -// In the SVN version of CKEditor, it does some more magic, for example it -// redirects all samples to the sample.html file. It still can be ignored anyway. -// %REMOVE_END% - -// Firebug has been presented some bugs with console. It must be "initialized" -// before the page load to work. -// FIXME: Remove the following in the future, if Firebug gets fixed. -if ( typeof console != 'undefined' ) - console.log(); - -// %REMOVE_START% -(function() -{ - // The sample##.html files also include this script. We don't want them to - // run, so we redirect to the samples.html page, passing the correct - // querystring parameter to load the desired page. - - var sampleMatch = window.location.pathname.match( /[\/\\]([^\/\\]+).html/ ); - if ( sampleMatch && sampleMatch[1] != 'sample' ) - window.location = 'sample.html?sample=' + sampleMatch[1] + ( location.search.length > 1 ? '&' + location.search.substr(1) : '' ); -})(); -// %REMOVE_END% if ( window.CKEDITOR ) { -// %REMOVE_START% - CKEDITOR.samples = (function() - { - var ajax = CKEDITOR.ajax; - - // Default values for the CKEDITOR.samples properties. - var samples = - { - htmlData : '

No HTML data available.

', - codeData : '

No code data available.

' - }; - - if ( /[?&]sample=[^&]+/.test( document.location.search ) ) - { - var currentSample = document.location.search.match( /[?&]sample=([^&]+)/ )[1]; - var sampleData = ajax.loadXml( CKEDITOR.getUrl( '_samples/' + currentSample + '.html' ) ); - - if ( sampleData ) - { - var getNodeHtml = function ( id ) - { - return sampleData.getInnerXml( '//*[@id="' + id + '"]' ); - }; - - samples.headScript = getNodeHtml( 'headscript' ) || ''; - samples.styles = getNodeHtml( 'styles' ) || ''; - samples.htmlData = getNodeHtml( 'html' ) || ''; - samples.codeData = getNodeHtml( 'code' ) || ''; - - if ( samples.headScript ) - samples.headScript = ''; - - if ( samples.styles ) - samples.styles = ''; - - // The '//*/*/*' XPath is the only way to make it work with - // xmlns="http://www.w3.org/1999/xhtml" without workarounds. It - // means that we must always have in this - // precise order. - document.title = sampleData.getInnerXml( '//*/*/*' ); - } - } - - return samples; - })(); -// %REMOVE_END% (function() { @@ -114,5 +45,6 @@ html += 'With non compatible browsers, you should still be able to see and edit the contents (HTML) in a plain text field.'; - document.getElementById( 'alerts' ).innerHTML = html; + var alertsEl = document.getElementById( 'alerts' ); + alertsEl && ( alertsEl.innerHTML = html ); }; Index: /CKEditor/branches/versions/3.1.x/_samples/sample_posteddata.php =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/sample_posteddata.php (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/sample_posteddata.php (revision 4882) @@ -2,5 +2,5 @@ <?php /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -53,5 +53,5 @@ - Copyright © 2003-2009, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved. + Copyright © 2003-2010, <a href="http://cksource.com/">CKSource</a> - Frederico Knabben. All rights reserved. </div> Index: /CKEditor/branches/versions/3.1.x/_samples/sharedspaces.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/sharedspaces.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/sharedspaces.html (revision 4882) @@ -1,114 +1,139 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>Replace Textarea by Code - CKEditor Sample - + Shared toolbars - CKEditor Sample + + + + + + -

+ CKEditor Sample +

+ +

- - Editor 1 (uses the shared toolbar and element path):
- -

+ +

+ + Editor 1 (uses the shared toolbar and element path):
+ This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. + -

- - Editor 2 (uses the shared toolbar and element path):
- This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. - +

+ + Editor 2 (uses the shared toolbar and element path):
+ This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. + -

- - Editor 3 (uses the shared toolbar only):
- This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. - +

+ + Editor 3 (uses the shared toolbar only):
+ This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. + -

- - Editor 4 (no shared spaces):
- This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. - -

- -

+ top : 'topSpace' + }, + + // Removes the maximize plugin as it's not usable + // in a shared toolbar. + removePlugins : 'maximize' + } ); + //]]> + +

+ + Editor 4 (no shared spaces):
+ This is some sample text. You are using <a href="http://ckeditor.com/">CKEditor</a>. + +

+ +

+ Index: /CKEditor/branches/versions/3.1.x/_samples/skins.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/skins.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/skins.html (revision 4882) @@ -1,5 +1,5 @@ - + @@ -7,55 +7,80 @@ Skins - CKEditor Sample - + + + + + + -

- -

+ //]]> + +

+ + Index: /CKEditor/branches/versions/3.1.x/_samples/ui_color.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/ui_color.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/ui_color.html (revision 4882) @@ -1,5 +1,5 @@ @@ -7,76 +7,84 @@ UI Color Setting Tool - CKEditor Sample - + + + + + + -

Click the UI Color Picker button to test your color preferences at runtime.

- -

-<form action="">
-  <p>
-    <label for="editor1">
-      Editor 1:</label><br />
-    <textarea name="editor1" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://ckeditor.com/">CKEditor</a>.</p></textarea>
-    <script type="text/javascript">
-    //<![CDATA[
-
-      CKEDITOR.replace( 'editor1' );
-
-    //]]>
-    </script>
-  </p>
-  <p>
-    <input type="submit" value="Submit" />
-  </p>
-</form>
-

+ //]]> + +

+ +

+ + Index: /CKEditor/branches/versions/3.1.x/_samples/ui_languages.html =================================================================== --- /CKEditor/branches/versions/3.1.x/_samples/ui_languages.html (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_samples/ui_languages.html (revision 4882) @@ -1,5 +1,5 @@ - + @@ -7,87 +7,104 @@ User Interface Globalization - CKEditor Sample - - + + + + + + + -

- + Index: /CKEditor/branches/versions/3.1.x/_source/adapters/jquery.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/adapters/jquery.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/adapters/jquery.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -23,5 +23,5 @@ * - setData.ckeditor( editor ) * Triggered when getData event is fired inside editor. - * + * * @example * @@ -49,4 +49,6 @@ ? true : CKEDITOR.config.jqueryOverrideVal; + var jQuery = window.jQuery; + if ( typeof jQuery == 'undefined' ) return; @@ -143,5 +145,8 @@ // Delay bit more if editor is still not ready. if ( !editor.element ) - return setTimeout( arguments.callee, 100 ); + { + setTimeout( arguments.callee, 100 ); + return; + } // Remove this listener. @@ -214,5 +219,8 @@ // Delay bit more if editor is still not ready. if ( !editor.element ) - return setTimeout( arguments.callee, 100 ); + { + setTimeout( arguments.callee, 100 ); + return; + } if ( editor.element.$ == element ) @@ -276,4 +284,6 @@ } } + + return true; }); return isSetter ? this : result; Index: /CKEditor/branches/versions/3.1.x/_source/core/_bootstrap.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/_bootstrap.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/_bootstrap.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/ajax.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/ajax.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/ajax.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/ckeditor.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/ckeditor.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/ckeditor.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/ckeditor_base.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/ckeditor_base.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/ckeditor_base.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/ckeditor_basic.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/ckeditor_basic.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/ckeditor_basic.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/command.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/command.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/command.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/commanddefinition.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/commanddefinition.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/commanddefinition.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/config.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/config.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/config.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -175,5 +175,5 @@ /** - * Sets the 'class' attribute to be used on body if it doesn't have one. + * Sets the 'class' attribute to be used on body if it doesn't have one. * @type String * @default '' Index: /CKEditor/branches/versions/3.1.x/_source/core/dom.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/comment.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/comment.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/comment.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -20,9 +20,9 @@ this.base( text ); }, - + proto : { type : CKEDITOR.NODE_COMMENT, - + getOuterHtml : function() { Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/document.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/document.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/document.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/documentfragment.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/documentfragment.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/documentfragment.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/domobject.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/domobject.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/domobject.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/element.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/element.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/element.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -257,13 +257,13 @@ * @example * // Before breaking: - * // This is some sample test text - * // If "element" is and "parent" is : - * // This is some sample test text + * // This is some sample test text + * // If "element" is and "parent" is : + * // This is some sample test text * element.breakParent( parent ); * @example * // Before breaking: - * // This is some sample test text - * // If "element" is and "parent" is : - * // This is some sample test text + * // This is some sample test text + * // If "element" is and "parent" is : + * // This is some sample test text * element.breakParent( parent ); */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/elementpath.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/elementpath.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/elementpath.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/event.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/event.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/event.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/node.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/node.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/node.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/nodelist.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/nodelist.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/nodelist.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/range.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/range.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/range.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/text.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/text.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/text.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/walker.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/walker.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/walker.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dom/window.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dom/window.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dom/window.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/dtd.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/dtd.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/dtd.js (revision 4882) @@ -1,4 +1,4 @@ -/* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +/* +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/editor.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/editor.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/editor.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -28,9 +28,11 @@ var loadConfig = function( editor ) { - var customConfig = CKEDITOR.getUrl( editor.config.customConfig ); + var customConfig = editor.config.customConfig; // Check if there is a custom config to load. if ( !customConfig ) return false; + + customConfig = CKEDITOR.getUrl( customConfig ); var loadedConfig = loadConfigLoaded[ customConfig ] || ( loadConfigLoaded[ customConfig ] = {} ); @@ -574,5 +576,9 @@ /** - * Sets the editor data. The data must be provided in raw format. + * Sets the editor data. The data must be provided in raw format (HTML). + * Note: This's an asynchronous method, the {@param callback} + * function should be relied on if you want to interact with the editor + * after data is fully loaded. + * * @param {String} data HTML code to replace the curent content in the editor. * @param {Function} callback Function to be called after the setData is completed. @@ -685,3 +691,2 @@ * config.htmlEncodeOutput = true; */ - Index: /CKEditor/branches/versions/3.1.x/_source/core/editor_basic.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/editor_basic.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/editor_basic.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/env.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/env.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/env.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/event.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/event.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/event.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/eventInfo.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/eventInfo.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/eventInfo.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/focusmanager.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/focusmanager.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/focusmanager.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/basicwriter.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/basicwriter.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/basicwriter.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/cdata.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/cdata.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/cdata.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/comment.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/comment.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/comment.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/element.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/element.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/element.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -192,5 +192,5 @@ { delete attributes[ a ]; - a = newAttrName; + a = newAttrName; continue; } @@ -213,5 +213,6 @@ // Send the attributes. - for ( i = 0, len = attribsArray.length ; i < len ; i++ ) + var len = attribsArray.length; + for ( i = 0 ; i < len ; i++ ) { var attrib = attribsArray[ i ]; Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/filter.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/filter.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/filter.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -112,5 +112,5 @@ { var type = node.type; - + return type == CKEDITOR.NODE_ELEMENT ? this.onElement( node ) : type == CKEDITOR.NODE_TEXT ? new CKEDITOR.htmlParser.text( this.onText( node.value ) ) : Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/fragment.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/fragment.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/fragment.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/text.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/text.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/htmlparser/text.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/imagecacher.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/imagecacher.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/imagecacher.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/lang.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/lang.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/lang.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/loader.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/loader.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/loader.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/plugindefinition.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/plugindefinition.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/plugindefinition.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/plugins.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/plugins.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/plugins.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/resourcemanager.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/resourcemanager.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/resourcemanager.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/scriptloader.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/scriptloader.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/scriptloader.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/skins.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/skins.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/skins.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -54,5 +54,5 @@ } ); } - + // Check if we need to preload images from it. if ( !preloaded[ skinName ] ) @@ -135,5 +135,5 @@ part.css = cssPart; - + cssIsLoaded = 1; } Index: /CKEditor/branches/versions/3.1.x/_source/core/themes.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/themes.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/themes.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/tools.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/tools.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/tools.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/ui.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/ui.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/ui.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/core/xml.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/core/xml.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/core/xml.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/_languages.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/_languages.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/_languages.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/_translationstatus.txt =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/_translationstatus.txt (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/_translationstatus.txt (revision 4882) @@ -1,3 +1,3 @@ -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license @@ -20,5 +20,5 @@ eu.js Found: 426 Missing: 63 fa.js Found: 317 Missing: 172 -fi.js Found: 432 Missing: 57 +fi.js Found: 434 Missing: 55 fo.js Found: 316 Missing: 173 fr-ca.js Found: 317 Missing: 172 Index: /CKEditor/branches/versions/3.1.x/_source/lang/af.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/af.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/af.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ar.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ar.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ar.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -602,44 +602,44 @@ colors : { - '000' : 'Black', - '800000' : 'Maroon', - '8B4513' : 'Saddle Brown', - '2F4F4F' : 'Dark Slate Gray', - '008080' : 'Teal', - '000080' : 'Navy', - '4B0082' : 'Indigo', - '696969' : 'Dim Gray', - 'B22222' : 'Fire Brick', - 'A52A2A' : 'Brown', - 'DAA520' : 'Golden Rod', - '006400' : 'Dark Green', - '40E0D0' : 'Turquoise', - '0000CD' : 'Medium Blue', - '800080' : 'Purple', - '808080' : 'Gray', - 'F00' : 'Red', - 'FF8C00' : 'Dark Orange', - 'FFD700' : 'Gold', - '008000' : 'Green', - '0FF' : 'Cyan', - '00F' : 'Blue', - 'EE82EE' : 'Violet', - 'A9A9A9' : 'Dark Gray', - 'FFA07A' : 'Light Salmon', - 'FFA500' : 'Orange', - 'FFFF00' : 'Yellow', - '00FF00' : 'Lime', - 'AFEEEE' : 'Pale Turquoise', - 'ADD8E6' : 'Light Blue', - 'DDA0DD' : 'Plum', - 'D3D3D3' : 'Light Grey', - 'FFF0F5' : 'Lavender Blush', - 'FAEBD7' : 'Antique White', - 'FFFFE0' : 'Light Yellow', - 'F0FFF0' : 'Honeydew', - 'F0FFFF' : 'Azure', - 'F0F8FF' : 'Alice Blue', - 'E6E6FA' : 'Lavender', - 'FFF' : 'White' + '000' : 'أسود', + '800000' : 'كستنائي', + '8B4513' : 'بني فاتح', + '2F4F4F' : 'رمادي أردوازي غامق', + '008080' : 'أزرق مخضر', + '000080' : 'أزرق داكن', + '4B0082' : 'كحلي', + '696969' : 'رمادي داكن', + 'B22222' : 'طوبي', + 'A52A2A' : 'بني', + 'DAA520' : 'ذهبي داكن', + '006400' : 'أخضر داكن', + '40E0D0' : 'فيروزي', + '0000CD' : 'أزرق متوسط', + '800080' : 'بنفسجي غامق', + '808080' : 'رمادي', + 'F00' : 'أحمر', + 'FF8C00' : 'برتقالي داكن', + 'FFD700' : 'ذهبي', + '008000' : 'أخضر', + '0FF' : 'تركواز', + '00F' : 'أزرق', + 'EE82EE' : 'بنفسجي', + 'A9A9A9' : 'رمادي شاحب', + 'FFA07A' : 'برتقالي وردي', + 'FFA500' : 'برتقالي', + 'FFFF00' : 'أصفر', + '00FF00' : 'ليموني', + 'AFEEEE' : 'فيروزي شاحب', + 'ADD8E6' : 'أزرق فاتح', + 'DDA0DD' : 'بنفسجي فاتح', + 'D3D3D3' : 'رمادي فاتح', + 'FFF0F5' : 'وردي فاتح', + 'FAEBD7' : 'أبيض عتيق', + 'FFFFE0' : 'أصفر فاتح', + 'F0FFF0' : 'أبيض مائل للأخضر', + 'F0FFFF' : 'سماوي', + 'F0F8FF' : 'لبني', + 'E6E6FA' : 'أرجواني', + 'FFF' : 'أبيض' }, Index: /CKEditor/branches/versions/3.1.x/_source/lang/bg.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/bg.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/bg.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/bn.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/bn.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/bn.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/bs.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/bs.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/bs.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ca.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ca.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ca.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/cs.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/cs.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/cs.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/da.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/da.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/da.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/de.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/de.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/de.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/el.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/el.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/el.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/en-au.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/en-au.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/en-au.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/en-ca.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/en-ca.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/en-ca.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/en-uk.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/en-uk.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/en-uk.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/en.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/en.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/en.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/eo.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/eo.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/eo.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/es.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/es.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/es.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/et.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/et.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/et.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/eu.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/eu.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/eu.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/fa.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/fa.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/fa.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/fi.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/fi.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/fi.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -693,5 +693,5 @@ }, - toolbarCollapse : 'Collapse Toolbar', // MISSING - toolbarExpand : 'Expand Toolbar' // MISSING + toolbarCollapse : 'Kutista työkalupalkki', + toolbarExpand : 'Laajenna työkalupalkki' }; Index: /CKEditor/branches/versions/3.1.x/_source/lang/fo.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/fo.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/fo.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/fr-ca.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/fr-ca.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/fr-ca.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/fr.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/fr.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/fr.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/gl.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/gl.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/gl.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/gu.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/gu.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/gu.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/he.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/he.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/he.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/hi.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/hi.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/hi.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/hr.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/hr.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/hr.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/hu.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/hu.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/hu.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/is.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/is.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/is.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/it.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/it.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/it.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ja.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ja.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ja.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/km.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/km.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/km.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ko.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ko.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ko.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/lt.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/lt.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/lt.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/lv.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/lv.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/lv.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/mn.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/mn.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/mn.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ms.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ms.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ms.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/nb.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/nb.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/nb.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/nl.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/nl.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/nl.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/no.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/no.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/no.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/pl.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/pl.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/pl.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/pt-br.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/pt-br.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/pt-br.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/pt.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/pt.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/pt.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ro.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ro.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ro.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/ru.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/ru.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/ru.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/sk.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/sk.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/sk.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/sl.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/sl.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/sl.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/sr-latn.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/sr-latn.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/sr-latn.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/sr.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/sr.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/sr.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/sv.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/sv.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/sv.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/th.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/th.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/th.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/tr.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/tr.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/tr.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/uk.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/uk.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/uk.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/vi.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/vi.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/vi.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/zh-cn.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/zh-cn.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/zh-cn.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/lang/zh.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/lang/zh.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/lang/zh.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/about/dialogs/about.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/about/dialogs/about.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/about/dialogs/about.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/about/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/about/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/about/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/basicstyles/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/basicstyles/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/basicstyles/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/blockquote/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/blockquote/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/blockquote/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/button/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/button/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/button/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/clipboard/dialogs/paste.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/clipboard/dialogs/paste.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/clipboard/dialogs/paste.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/clipboard/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/clipboard/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/clipboard/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -79,8 +79,8 @@ // Paste command. var pasteCmd = - { + { canUndo : false, - exec : + exec : CKEDITOR.env.ie ? function( editor ) @@ -171,9 +171,11 @@ var pastebin = new CKEDITOR.dom.element( mode == 'text' ? 'textarea' : 'div', doc ); pastebin.setAttribute( 'id', 'cke_pastebin' ); + // Safari requires a filler node inside the div to have the content pasted into it. (#4882) + CKEDITOR.env.webkit && pastebin.append( doc.createText( '\xa0' ) ); doc.getBody().append( pastebin ); // It's definitely a better user experience if we make the paste-bin pretty unnoticed // by pulling it off the screen, while this hack will make the paste-bin a control type element - // and that become a selection plain later. + // and that become a selection plain later. if ( !CKEDITOR.env.ie && mode != 'html' ) { @@ -235,5 +237,5 @@ callback( pastebin[ 'get' + ( mode == 'text' ? 'Value' : 'Html' ) ]() ); }, 0 ); - }; + } // Register the plugin. @@ -257,6 +259,9 @@ editor.on( 'pasteDialog', function( evt ) { - // Open default paste dialog. - editor.openDialog( 'paste' ); + setTimeout( function() + { + // Open default paste dialog. + editor.openDialog( 'paste' ); + }, 0 ); }); @@ -304,4 +309,7 @@ function( evt ) { + if( depressBeforePasteEvent ) + return; + getClipboardData.call( editor, evt, mode, function ( data ) { @@ -322,7 +330,15 @@ if ( editor.contextMenu ) { + var depressBeforePasteEvent; function stateFromNamedCommand( command ) { - return editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED; + // IE Bug: queryCommandEnabled('paste') fires also 'beforepaste', + // guard to distinguish from the ordinary sources( either + // keyboard paste or execCommand ) (#4874). + CKEDITOR.env.ie && command == 'Paste'&& ( depressBeforePasteEvent = 1 ); + + var retval = editor.document.$.queryCommandEnabled( command ) ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED; + depressBeforePasteEvent = 0; + return retval; } Index: /CKEditor/branches/versions/3.1.x/_source/plugins/colorbutton/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/colorbutton/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/colorbutton/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -70,5 +70,5 @@ evt.name == 'ok' && applyColorStyle( this.getContentElement( 'picker', 'selectedColor' ).getValue(), type ); } - + editor.openDialog( 'colordialog', function() { Index: /CKEditor/branches/versions/3.1.x/_source/plugins/colordialog/dialogs/colordialog.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/colordialog/dialogs/colordialog.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/colordialog/dialogs/colordialog.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/contextmenu/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/contextmenu/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/contextmenu/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -178,18 +178,4 @@ } - // Certain forms of IE selection changes on 'contextmenu' event, - // lock the selection before that.(#4041) - if ( CKEDITOR.env.ie ) - { - element.on( 'mousedown', function( event ) - { - if ( event.data.$.button == 2 ) - { - var selection = this.editor.getSelection(); - selection && selection.lock(); - } - }, this ); - } - element.on( 'contextmenu', function( event ) { @@ -201,4 +187,12 @@ ( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey ) ) return; + + // Selection will be unavailable after context menu shows up + // in IE, lock it now. + if ( CKEDITOR.env.ie ) + { + var selection = this.editor.getSelection(); + selection && selection.lock(); + } // Cancel the browser context menu. Index: /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/dialogDefinition.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/dialogDefinition.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/dialogDefinition.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/dialog/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -2696,5 +2696,5 @@ * Loads and opens a registered dialog. * @param {String} dialogName The registered name of the dialog. - * @param {Function} callback The function to be invoked after dialog instance created. + * @param {Function} callback The function to be invoked after dialog instance created. * @see CKEDITOR.dialog.add * @example Index: /CKEditor/branches/versions/3.1.x/_source/plugins/dialogui/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/dialogui/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/dialogui/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/div/dialogs/div.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/div/dialogs/div.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/div/dialogs/div.js (revision 4882) @@ -1,4 +1,4 @@ /* - * Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. + * Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. * For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -6,5 +6,5 @@ (function() { - + /** * Add to collection with DUP examination. @@ -23,5 +23,5 @@ } } - + function getNonEmptyChildren( element ) { @@ -31,6 +31,6 @@ { var child = children.getItem( i ); - if( ! ( child.type === CKEDITOR.NODE_TEXT - && /^[ \t\n\r]+$/.test( child.getText() ) ) ) + if( ! ( child.type === CKEDITOR.NODE_TEXT + && ( /^[ \t\n\r]+$/ ).test( child.getText() ) ) ) retval.push( child ); } @@ -48,5 +48,5 @@ // Definition of elements at which div operation should stopped. var divLimitDefinition = ( function(){ - + // Customzie from specialize blockLimit elements var definition = CKEDITOR.tools.extend( {}, CKEDITOR.dtd.$blockLimit ); @@ -55,5 +55,5 @@ delete definition.div; - // Exclude 'td' and 'th' when 'wrapping table' + // Exclude 'td' and 'th' when 'wrapping table' if( editor.config.div_wrapTable ) { @@ -63,8 +63,8 @@ return definition; })(); - + // DTD of 'div' element var dtd = CKEDITOR.dtd.div; - + /** * Get the first div limit element on the element's path. @@ -75,7 +75,7 @@ var pathElements = new CKEDITOR.dom.elementPath( element ).elements; var divLimit; - for ( var i = 0; i < pathElements.length ; i++ ) - { - if ( pathElements[ i ].getName() in divLimitDefinition ) + for ( var i = 0; i < pathElements.length ; i++ ) + { + if ( pathElements[ i ].getName() in divLimitDefinition ) { divLimit = pathElements[ i ]; @@ -85,5 +85,5 @@ return divLimit; } - + /** * Init all fields' setup/commit function. @@ -115,5 +115,6 @@ // ignore default element attribute values if ( 'dir' == field.id && element.getComputedStyle( 'direction' ) == fieldValue ) - return true; + return; + if ( fieldValue ) element.setAttribute( field.id, fieldValue ); @@ -125,5 +126,5 @@ } ); } - + /** * Wrapping 'div' element around appropriate blocks among the selected ranges. @@ -182,11 +183,11 @@ // Calculate the common parent node of all contained elements. ancestor = currentNode.getParent(); - for ( var j = 1 ; j < blockGroups[ i ].length; j++ ) + for ( j = 1 ; j < blockGroups[ i ].length; j++ ) ancestor = ancestor.getCommonAncestor( blockGroups[ i ][ j ] ); divElement = new CKEDITOR.dom.element( 'div', editor.document ); - + // Normalize the blocks in each group to a common parent. - for( var j = 0; j < blockGroups[ i ].length ; j++ ) + for( j = 0; j < blockGroups[ i ].length ; j++ ) { currentNode = blockGroups[ i ][ j ]; @@ -201,5 +202,5 @@ // Wrapped blocks counting var fixedBlock = null; - for ( var j = 0 ; j < blockGroups[ i ].length ; j++ ) + for ( j = 0 ; j < blockGroups[ i ].length ; j++ ) { currentNode = blockGroups[ i ][ j ]; @@ -211,5 +212,5 @@ // Establish new container, wrapping all elements in this group. - if ( j == 0 ) + if ( !j ) divElement.insertBefore( currentNode ); @@ -258,17 +259,17 @@ return groups; } - - /** - * Hold a collection of created block container elements. + + /** + * Hold a collection of created block container elements. */ var containers = []; /** * @type divDialog - */ + */ return { title : editor.lang.div.title, minWidth : 400, minHeight : 165, - contents : + contents : [ { @@ -276,10 +277,10 @@ label :editor.lang.common.generalTab, title :editor.lang.common.generalTab, - elements : + elements : [ { type :'hbox', widths : [ '50%', '50%' ], - children : + children : [ { @@ -307,7 +308,7 @@ label :editor.lang.common.cssClass, 'default' : '' - } + } ] - } + } ] }, @@ -316,15 +317,15 @@ label :editor.lang.common.advancedTab, title :editor.lang.common.advancedTab, - elements : + elements : [ { type :'vbox', padding :1, - children : + children : [ { type :'hbox', widths : [ '50%', '50%' ], - children : + children : [ { @@ -339,10 +340,10 @@ label :editor.lang.link.langCode, 'default' : '' - } + } ] }, { type :'hbox', - children : + children : [ { @@ -352,10 +353,10 @@ label :editor.lang.common.cssStyle, 'default' : '' - } + } ] }, { type :'hbox', - children : + children : [ { @@ -365,5 +366,5 @@ label :editor.lang.common.advisoryTitle, 'default' : '' - } + } ] }, @@ -374,20 +375,20 @@ label :editor.lang.common.langDir, 'default' : '', - items : + items : [ [ editor.lang.common.langDirLtr, - 'ltr' + 'ltr' ], [ editor.lang.common.langDirRtl, - 'rtl' - ] + 'rtl' + ] ] - } + } ] - } + } ] - } + } ], onLoad : function() @@ -414,5 +415,5 @@ else containers = createDiv( editor, true ); - + // Update elements attributes for( var i = 0 ; i < containers.length ; i++ ) @@ -422,5 +423,5 @@ }; } - + CKEDITOR.dialog.add( 'creatediv', function( editor ) { Index: /CKEditor/branches/versions/3.1.x/_source/plugins/div/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/div/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/div/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -6,5 +6,5 @@ /** * @fileOverview The "div" plugin. It wraps the selected block level elements with a 'div' element with specified styles and attributes. - * + * */ @@ -58,5 +58,5 @@ } - for ( var i = 0 ; i < toRemove.length ; i++ ) + for ( i = 0 ; i < toRemove.length ; i++ ) toRemove[ i ].remove( true ); @@ -64,5 +64,5 @@ } } ); - + editor.ui.addButton( 'CreateDiv', { @@ -107,5 +107,5 @@ editdiv : CKEDITOR.TRISTATE_OFF, removediv : CKEDITOR.TRISTATE_OFF - } + }; } @@ -114,5 +114,5 @@ } } - + CKEDITOR.dialog.add( 'creatediv', this.path + 'dialogs/div.js' ); CKEDITOR.dialog.add( 'editdiv', this.path + 'dialogs/div.js' ); Index: /CKEditor/branches/versions/3.1.x/_source/plugins/domiterator/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/domiterator/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/domiterator/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/editingblock/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/editingblock/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/editingblock/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/elementspath/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/elementspath/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/elementspath/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/enterkey/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/enterkey/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/enterkey/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/entities/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/entities/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/entities/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/fakeobjects/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/fakeobjects/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/fakeobjects/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -85,6 +85,6 @@ CKEDITOR.editor.prototype.createFakeParserElement = function( realElement, className, realElementType, isResizable ) { - var lang = this.lang.fakeobjects, - html, writer; + var lang = this.lang.fakeobjects, + html; var writer = new CKEDITOR.htmlParser.basicWriter(); @@ -115,6 +115,6 @@ return null; - return CKEDITOR.dom.element.createFromHtml( - decodeURIComponent( fakeElement.getAttribute( '_cke_realelement' ) ), + return CKEDITOR.dom.element.createFromHtml( + decodeURIComponent( fakeElement.getAttribute( '_cke_realelement' ) ), this.document ); }; Index: /CKEditor/branches/versions/3.1.x/_source/plugins/filebrowser/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/filebrowser/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/filebrowser/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/find/dialogs/find.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/find/dialogs/find.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/find/dialogs/find.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/find/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/find/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/find/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/flash/dialogs/flash.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/flash/dialogs/flash.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/flash/dialogs/flash.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -563,13 +563,13 @@ [ [ editor.lang.common.notSet , ''], - [ editor.lang.image.alignLeft , 'left'], - [ editor.lang.image.alignAbsBottom , 'absBottom'], - [ editor.lang.image.alignAbsMiddle , 'absMiddle'], - [ editor.lang.image.alignBaseline , 'baseline'], - [ editor.lang.image.alignBottom , 'bottom'], - [ editor.lang.image.alignMiddle , 'middle'], - [ editor.lang.image.alignRight , 'right'], - [ editor.lang.image.alignTextTop , 'textTop'], - [ editor.lang.image.alignTop , 'top'] + [ editor.lang.flash.alignLeft , 'left'], + [ editor.lang.flash.alignAbsBottom , 'absBottom'], + [ editor.lang.flash.alignAbsMiddle , 'absMiddle'], + [ editor.lang.flash.alignBaseline , 'baseline'], + [ editor.lang.flash.alignBottom , 'bottom'], + [ editor.lang.flash.alignMiddle , 'middle'], + [ editor.lang.flash.alignRight , 'right'], + [ editor.lang.flash.alignTextTop , 'textTop'], + [ editor.lang.flash.alignTop , 'top'] ], setup : loadValue, Index: /CKEditor/branches/versions/3.1.x/_source/plugins/flash/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/flash/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/flash/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -110,5 +110,5 @@ for ( var i = 0 ; i < element.children.length ; i++ ) { - if ( element.children[ i ].name == 'embed' ) + if ( element.children[ i ].name == 'cke:embed' ) { if ( !isFlashEmbed( element.children[ i ] ) ) Index: /CKEditor/branches/versions/3.1.x/_source/plugins/floatpanel/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/floatpanel/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/floatpanel/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/font/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/font/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/font/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/format/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/format/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/format/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -58,5 +58,9 @@ styles[ value ].apply( editor.document ); - editor.fire( 'saveSnapshot' ); + // Save the undo snapshot after all changes are affected. (#4899) + setTimeout( function() + { + editor.fire( 'saveSnapshot' ); + }, 0 ); }, Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/button.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/button.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/button.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/checkbox.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/checkbox.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/checkbox.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/form.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/form.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/form.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/hiddenfield.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/hiddenfield.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/hiddenfield.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/radio.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/radio.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/radio.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/select.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/select.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/select.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/textarea.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/textarea.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/textarea.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/textfield.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/textfield.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/dialogs/textfield.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/forms/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/forms/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/forms/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/horizontalrule/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/horizontalrule/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/horizontalrule/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ Index: /CKEditor/branches/versions/3.1.x/_source/plugins/htmldataprocessor/plugin.js =================================================================== --- /CKEditor/branches/versions/3.1.x/_source/plugins/htmldataprocessor/plugin.js (revision 4881) +++ /CKEditor/branches/versions/3.1.x/_source/plugins/htmldataprocessor/plugin.js (revision 4882) @@ -1,4 +1,4 @@ /* -Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -239,5 +239,5 @@ unprotectElementNamesRegex = /(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi; - var protectSelfClosingRegex = //gi; + var protectSelfClosingRegex = /]*?)\/?>(?!\s*<\/cke:\1)/gi; function protectAttributes( html ) @@ -290,5 +290,5 @@ function unprotectRealComments( html ) { - return html.replace( //g, function( match, data ) + return html.replace( //g, function( match, data ) { return decodeURIComponent( data ); @@ -305,5 +305,5 @@ // Script tags will also be forced to be protected, otherwise // IE will execute them. - //gi, + ( //gi ), //

- CKEditor 3.1 (SVN)

+ CKEditor Sample +

+ Part 1

- Part 1

- Part 2

- Part 3

+ Part 2

+ Part 3

+ CKEditor Sample +

+ CKEditor Sample +

+ CKEditor Sample +

+ CKEditor Sample +

- CKEditor Sample -

+ CKEditor Sample +

+ CKEditor Sample +

+ CKEditor Sample +

+ CKEditor Sample +