Full Page Test<\/title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"><\/head><body><p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.<\/body><\/html>' ; +oFCKeditor.Value = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>Full Page Test<\/title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"><\/head><body><p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/body><\/html>' ; oFCKeditor.Create() ; //--> Index: /FCKeditor/branches/versions/2.6.x/_testcases/sampleposteddata.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/_testcases/sampleposteddata.asp (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_testcases/sampleposteddata.asp (revision 4268) @@ -47,5 +47,5 @@ <td valign="top" style="white-space: nowrap;"> <b> - <%=sForm%> + <%=Server.HTMLEncode(sForm)%> </b> </td> Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 4268) @@ -34,141 +34,71 @@ FCKeditor ChangeLog - What's New?</h1> <h3> - Version 2.6.4.1</h3> - <p> - Fixed Bugs:</p> - <ul> - <li><strong>Security release, upgrade is highly recommended.</strong></li> - </ul> - <h3> - Version 2.6.4</h3> - <p> - Fixed Bugs:</p> - <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2777">#2777</a>] Merging - cells between table header and body is no longer possible.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2815">#2815</a>] Fixed - WSC issues at slow connection speed. Added SSL support.</li> - <li>Language file updates for the following languages: - <ul> - <li>Chinese (Traditional)</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2846">#2846</a>] French</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2801">#2801</a>] Hebrew</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2824">#2824</a>] Russian</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2811">#2811</a>] Turkish</li> - </ul> - </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2757">#2757</a>] Fixed - a minor bug which causes selection positions to be improperly restored during undos - and redos.</li> - </ul> - <h3> - Version 2.6.4 Beta</h3> + Version 2.6.5</h3> <p> New Features and Improvements:</p> <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2685">#2685</a>] Integration - with "WebSpellChecker", a <strong>zero installation and free spell checker</strong> - provided by SpellChecker.net. This is now the default spell checker in the editor - (requires internet connection). All previous spell checking solutions are still - available.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2430">#2430</a>] In the - table dialog it's possible to create header cells in the first row (included in - a thead element) or the first column of the table. </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/822">#822</a>] The table - cell dialog allows switching between normal data cells or header cells (TD vs. TH). - </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2515">#2515</a>] New language - file for Icelandic.</li> + <li>Introduced the Spell Check As You Type (SCAYT) spell checking option.</li> </ul> <p> Fixed Bugs:</p> <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2381">#2381</a>] Protected - the editor from duplicate iframes</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1752">#1752</a>] Fixed - the issue with tablecommands plugin and undefined tagName.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The > - character inside text wasn't encoded in Opera and Safari.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed - JavaScript error with the fit window command in source mode.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2472">#2472</a>] Splitting - a TH will create a two TH, not a TH and a TD.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed - unnecessary name attributes in dialogs. </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, <a target="_blank" - href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was placed inside - a container with dimensions or floating it wasn't possible to edit its properties - from the toolbar or context menu.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1982">#1982</a>] Submenus - in IE7 now are shown properly.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using - the Paste dialogs in IE might insert the content at the start of the editor.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2349">#2496</a>] Fixed - RTL dialog layout in Internet Explorer.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed - the issue where email links in IE would take the browser to a new page in addition - to calling up the email client.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2519">#2519</a>] Fixed - race condition at registering the FCKeditorAPI object in multiple editor scenarios.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2525">#2525</a>] Fixed - JavaScript error in Google Chrome when StartupShowBlocks is set to true.</li> + <li><strong>Security release, upgrade is highly recommended</strong> (fixed security issues in ASP and ColdFusion scripts). + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2856">#2856</a>] Fixed + problem with inches in paste dialog.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3120">#3120</a>] + # (pound sign) is not correctly escaped in file urls.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2915">#2915</a>] + About plugin shows misleading user language.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2821">#2821</a>] Configuration + items that used floating point numbers were parsed as integers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2604">#2064</a>] The asp + connector didn't work correctly in windows 2000 servers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3429">#3429</a>] Fixed + problem in IE8 with XHTML doctype. Thanks to duncansimey.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3446">#3446</a>] Fixed self-closed + <option> in the table cell dialog.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3181">#3181</a>] Node selection + could raise an error in IE8.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2156">#2156</a>] + After calling GetData() the style removal operations didn't work in IE. Thanks to + Compendium Blogware.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3427">#3427</a>] Improved + compatibility of Document properties dialog with Eclipse.</li> <li>Language file updates for the following languages: <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2440">#2440</a>] Dutch</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2451</a>] Basque</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2650</a>] Danish</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2208">#2535</a>] German - </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2908">#2908</a>] Czech </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2849">#2849</a>] Lithuanian</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3636">#3636</a>] Polish</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3741">#3741</a>] Korean</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2861">#2861</a>] Slovenian</li> </ul> </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2531">#2531</a>] The ENTER - key will properly scroll to the cursor position when breaking long paragraphs.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2573">#2573</a>] The type - name in configurations for the ASP connector are now case sensitive.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2503">#2503</a>] DL, DT - and DD where missing the formatting in the generated HTML.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2516">#2516</a>] Replaced - the extension AddItem of Array with the standard "push" method.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically - splitting cell with colspan > 1 breaks table layout.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2597">#2597</a>] Fixed - the issue where dropping contents from outside of the editor doesn't work in Safari.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] Fixed - the issue where FCK.InsertHtml() is no longer removing selected contents after content - insertion in Firefox.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2407">#2407</a>] Fixed - the issue where the Div container command and the blockquote command would break - lists.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2469">#2469</a>] Fixed - a minor issue where FCK.SetData() may cause the editor to become unresponsive to - the first click after being defocused.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2611">#2611</a>] Fixed - an extra slash on quickupload of the asp connector.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2616">#2616</a>] Fixed - another situation where new elements were inserted at the beginning of the content - in IE.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2634">#2634</a>] Fixed - two obsolete references to Array::AddItem() instances still in the code.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2679">#2679</a>] Fixed - infinite loop problems with FCKDomRangeIterator class which causes some commands - to hang when applied to certain document structures.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2649">#2649</a>] Fixed - a JavaScript error in IE when user tries to search with the "Match whole word" option - enabled and the matched word is at exactly the end of document.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2603">#2603</a>] Changed - the <a href="http://docs.fckeditor.net/EMailProtection">EMailProtection</a> to "none" - for better compatibility.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2612">#2612</a>] The 'ForcePasteAsPlainText' - configuration option didn't work correctly in Safari and Chrome.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2696">#2696</a>] Fixed - non-working autogrow plugin.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2753">#2753</a>] Fixed - occasional exceptions in the dragersizetable plugin with IE.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2653">#2653</a>] and [<a - target="_blank" href="http://dev.fckeditor.net/ticket/2733">#2733</a>] Enable undo - of changes to tables and table cells.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1865">#1865</a>] The context - menu is now working properly over the last row in a table with thead. Thanks to - Koen Willems.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3439">#3439</a>] IgnoreEmptyParagraphValue + had no effect if ProcessHTMLEntities is false.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3880">#3880</a>] Fixed some minor + logical and typing mistakes in fckdomrange_ie.js.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2689">#2689</a>] If a + custom connector tried to use the "url" attribute for files it was always reencoded.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1537">#1537</a>] Fixed extra + <p> tag added before pasted contents from Paste From Word dialog.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2874">#2874</a>] Fixed wrong position + of caption tag in tables with table headers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3818">#3818</a>] Fixed layout error + in text and background color popups when more colors button is disabled.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3481">#3481</a>] Fixed an issue in + WebKit where paste actions inside table cells may leak outside of the table cell.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3677">#3677</a>] Fixed JavaScript + error when trying to create link for images inside floating div containers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3925">#3925</a>] Removed obsolete + parentWindow reference from FCKDialog.OpenDialog().</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2936">#2936</a>] Added protection + in the PHP upload if the destination folder is placed at the root and doesn't exit.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/4357">#4357</a>] Avoid problem in + the paste dialog if IIS is set to process HTML files as Asp.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2201">#2201</a>] Fixed a crash in IE + in an object is selected (with handles) on unload of the editor.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3053">#3053</a>] Fixed problems with + the height of the content area in Safari and Chrome.</li> </ul> <p> Index: /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 4268) @@ -33,4 +33,143 @@ <h1> FCKeditor ChangeLog - What's New?</h1> + <h3> + Version 2.6.4.1</h3> + <p> + Fixed Bugs:</p> + <ul> + <li><strong>Security release, upgrade is highly recommended.</strong></li> + </ul> + <h3> + Version 2.6.4</h3> + <p> + Fixed Bugs:</p> + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2777">#2777</a>] Merging + cells between table header and body is no longer possible.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2815">#2815</a>] Fixed + WSC issues at slow connection speed. Added SSL support.</li> + <li>Language file updates for the following languages: + <ul> + <li>Chinese (Traditional)</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2846">#2846</a>] French</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2801">#2801</a>] Hebrew</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2824">#2824</a>] Russian</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2811">#2811</a>] Turkish</li> + </ul> + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2757">#2757</a>] Fixed + a minor bug which causes selection positions to be improperly restored during undos + and redos.</li> + </ul> + <h3> + Version 2.6.4 Beta</h3> + <p> + New Features and Improvements:</p> + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2685">#2685</a>] Integration + with "WebSpellChecker", a <strong>zero installation and free spell checker</strong> + provided by SpellChecker.net. This is now the default spell checker in the editor + (requires internet connection). All previous spell checking solutions are still + available.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2430">#2430</a>] In the + table dialog it's possible to create header cells in the first row (included in + a thead element) or the first column of the table. </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/822">#822</a>] The table + cell dialog allows switching between normal data cells or header cells (TD vs. TH). + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2515">#2515</a>] New language + file for Icelandic.</li> + </ul> + <p> + Fixed Bugs:</p> + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2381">#2381</a>] Protected + the editor from duplicate iframes</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1752">#1752</a>] Fixed + the issue with tablecommands plugin and undefined tagName.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The > + character inside text wasn't encoded in Opera and Safari.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed + JavaScript error with the fit window command in source mode.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2472">#2472</a>] Splitting + a TH will create a two TH, not a TH and a TD.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed + unnecessary name attributes in dialogs. </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, <a target="_blank" + href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was placed inside + a container with dimensions or floating it wasn't possible to edit its properties + from the toolbar or context menu.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1982">#1982</a>] Submenus + in IE7 now are shown properly.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using + the Paste dialogs in IE might insert the content at the start of the editor.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2349">#2496</a>] Fixed + RTL dialog layout in Internet Explorer.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed + the issue where email links in IE would take the browser to a new page in addition + to calling up the email client.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2519">#2519</a>] Fixed + race condition at registering the FCKeditorAPI object in multiple editor scenarios.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2525">#2525</a>] Fixed + JavaScript error in Google Chrome when StartupShowBlocks is set to true.</li> + <li>Language file updates for the following languages: + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2440">#2440</a>] Dutch</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2451</a>] Basque</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2650</a>] Danish</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2208">#2535</a>] German + </li> + </ul> + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2531">#2531</a>] The ENTER + key will properly scroll to the cursor position when breaking long paragraphs.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2573">#2573</a>] The type + name in configurations for the ASP connector are now case sensitive.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2503">#2503</a>] DL, DT + and DD where missing the formatting in the generated HTML.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2516">#2516</a>] Replaced + the extension AddItem of Array with the standard "push" method.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically + splitting cell with colspan > 1 breaks table layout.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2597">#2597</a>] Fixed + the issue where dropping contents from outside of the editor doesn't work in Safari.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] Fixed + the issue where FCK.InsertHtml() is no longer removing selected contents after content + insertion in Firefox.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2407">#2407</a>] Fixed + the issue where the Div container command and the blockquote command would break + lists.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2469">#2469</a>] Fixed + a minor issue where FCK.SetData() may cause the editor to become unresponsive to + the first click after being defocused.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2611">#2611</a>] Fixed + an extra slash on quickupload of the asp connector.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2616">#2616</a>] Fixed + another situation where new elements were inserted at the beginning of the content + in IE.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2634">#2634</a>] Fixed + two obsolete references to Array::AddItem() instances still in the code.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2679">#2679</a>] Fixed + infinite loop problems with FCKDomRangeIterator class which causes some commands + to hang when applied to certain document structures.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2649">#2649</a>] Fixed + a JavaScript error in IE when user tries to search with the "Match whole word" option + enabled and the matched word is at exactly the end of document.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2603">#2603</a>] Changed + the <a href="http://docs.fckeditor.net/EMailProtection">EMailProtection</a> to "none" + for better compatibility.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2612">#2612</a>] The 'ForcePasteAsPlainText' + configuration option didn't work correctly in Safari and Chrome.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2696">#2696</a>] Fixed + non-working autogrow plugin.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2753">#2753</a>] Fixed + occasional exceptions in the dragersizetable plugin with IE.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2653">#2653</a>] and [<a + target="_blank" href="http://dev.fckeditor.net/ticket/2733">#2733</a>] Enable undo + of changes to tables and table cells.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1865">#1865</a>] The context + menu is now working properly over the last row in a table with thead. Thanks to + Koen Willems.</li> + </ul> <h3> Version 2.6.3</h3> Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange_ie.js (revision 4268) @@ -78,5 +78,5 @@ { var bIsCollapsed = this.CheckIsCollapsed() ; - var bIsStartMakerAlone ; + var bIsStartMarkerAlone ; var dummySpan ; @@ -112,5 +112,5 @@ else { - bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; + bIsStartMarkerAlone = forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br'; // Append a temporary <span></span> before the selection. @@ -123,5 +123,5 @@ eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ; - if ( bIsStartMakerAlone ) + if ( bIsStartMarkerAlone ) { // To expand empty blocks or line spaces after <br>, we need @@ -142,5 +142,5 @@ if ( bIsCollapsed ) { - if ( bIsStartMakerAlone ) + if ( bIsStartMarkerAlone ) { // Move the selection start to include the temporary . Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js (revision 4268) @@ -356,5 +356,9 @@ { if ( this.Document ) + { + // Avoid IE crash if an object is selected on unload #2201 + this.Document.selection.empty() ; this.Document.body.innerHTML = "" ; + } this.TargetElement = null ; this.IFrame = null ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 4268) @@ -234,4 +234,7 @@ } + // Save the popup related arguments so they can be used by others (e.g. SCAYT). + this._PopupArgs = [x, y, iMainWidth, eMainNode.offsetHeight, relElement]; + // Second call: Show the Popup at the specified location, with the correct size. this._Popup.show( x, y, iMainWidth, eMainNode.offsetHeight, relElement ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js (revision 4268) @@ -41,5 +41,5 @@ FCKDialogCommand.prototype.Execute = function() { - FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ; + FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, this.Resizable ) ; } @@ -187,5 +187,5 @@ var iWidth = FCKConfig.ScreenWidth * 0.65 ; var iHeight = FCKConfig.ScreenHeight * 0.65 ; - FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, null, true ) ; + FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, true ) ; } else Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 4268) @@ -194,8 +194,8 @@ FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ; - } - - // Dirty hack for Opera, Safari and Firefox 3. - if ( !FCKBrowserInfo.IsIE ) - oDiv.style.width = '96%' ; -} + + // Dirty hack for Opera, Safari and Firefox 3. + if ( !FCKBrowserInfo.IsIE ) + oDiv.style.width = '96%' ; + } +} Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 4268) @@ -236,4 +236,6 @@ GetData : function( format ) { + FCK.Events.FireEvent("OnBeforeGetData") ; + // We assume that if the user is in source editing, the editor value must // represent the exact contents of the source, as the user wanted it to be. @@ -271,5 +273,9 @@ } - return FCKConfig.ProtectedSource.Revert( data ) ; + data = FCKConfig.ProtectedSource.Revert( data ) ; + + setTimeout( function() { FCK.Events.FireEvent("OnAfterGetData") ; }, 0 ) ; + + return data ; }, @@ -495,5 +501,5 @@ } - if ( FCKBrowserInfo.IsGecko ) + if ( window.onresize ) window.onresize() ; }, @@ -958,4 +964,36 @@ FCKTools.AddEventListener( FCK.EditorDocument, 'mousedown', _FCK_MouseEventsListener ) ; FCKTools.AddEventListener( FCK.EditorDocument, 'mouseup', _FCK_MouseEventsListener ) ; + if ( FCKBrowserInfo.IsSafari ) + { + // #3481: WebKit has a bug with paste where the paste contents may leak + // outside table cells. So add padding nodes before and after the paste. + FCKTools.AddEventListener( FCK.EditorDocument, 'paste', function( evt ) + { + var range = new FCKDomRange( FCK.EditorWindow ); + var nodeBefore = FCK.EditorDocument.createTextNode( '\ufeff' ); + var nodeAfter = FCK.EditorDocument.createElement( 'a' ); + nodeAfter.id = 'fck_paste_padding'; + nodeAfter.innerHTML = ''; + range.MoveToSelection(); + range.DeleteContents(); + + // Insert padding nodes. + range.InsertNode( nodeBefore ); + range.Collapse(); + range.InsertNode( nodeAfter ); + + // Move the selection to between the padding nodes. + range.MoveToPosition( nodeAfter, 3 ); + range.Select(); + + // Remove the padding nodes after the paste is done. + setTimeout( function() + { + nodeBefore.parentNode.removeChild( nodeBefore ); + nodeAfter = FCK.EditorDocument.getElementById( 'fck_paste_padding' ); + nodeAfter.parentNode.removeChild( nodeAfter ); + }, 0 ); + } ); + } // Most of the CTRL key combos do not work under Safari for onkeydown and onkeypress (See #1119) Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 4268) @@ -376,4 +376,14 @@ range = new FCKDomRange( this.EditorWindow ) ; range.MoveToSelection() ; + + // If the first element (if exists) of the document fragment is a block + // element, then split the current block. (#1537) + var currentNode = docFrag.RootNode.firstChild ; + while ( currentNode && currentNode.nodeType != 1 ) + currentNode = currentNode.nextSibling ; + + if ( currentNode && FCKListsLib.BlockElements[ currentNode.nodeName.toLowerCase() ] ) + range.SplitBlock() ; + range.DeleteContents() ; range.InsertNode( docFrag.RootNode ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 4268) @@ -173,5 +173,10 @@ // Remove the fake node - FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode( true ) ; + var fake = FCK.EditorDocument.getElementById('__fakeFCKRemove__') ; + // If the span is the only child of a node (so the inserted HTML is beyond that), + // remove also that parent that isn't needed. #1537 + if (fake.parentNode.childNodes.length == 1) + fake = fake.parentNode ; + fake.removeNode( true ) ; FCKDocumentProcessor.Process( FCK.EditorDocument ) ; @@ -374,7 +379,12 @@ // Creates the array that will be returned. It contains one or more created links (see #220). var aCreatedLinks = new Array() ; + var isControl = FCKSelection.GetType() == 'Control' ; + var selectedElement = isControl && FCKSelection.GetSelectedElement() ; // Remove any existing link in the selection. - FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ; + // IE BUG: Unlinking a floating control selection that is not inside a link + // will collapse the selection. (#3677) + if ( !( isControl && !FCKTools.GetElementAscensor( selectedElement, 'a' ) ) ) + FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ; if ( url.length > 0 ) @@ -382,5 +392,5 @@ // If there are several images, and you try to link each one, all the images get inside the link: // <img><img> -> <a><img></a><img> -> <a><img><img></a> due to the call to 'CreateLink' (bug in IE) - if (FCKSelection.GetType() == 'Control') + if ( isControl ) { // Create a link @@ -389,5 +399,5 @@ // Get the selected object - var oControl = FCKSelection.GetSelectedElement() ; + var oControl = selectedElement ; // Put the link just before the object oControl.parentNode.insertBefore(oLink, oControl) ; @@ -449,5 +459,5 @@ // in editable mode. Otherwise the whole browser window may be locked by // the buttons. (#1782) - if ( e.nodeName.IEquals( 'input' ) && e.type.IEquals( ['radio', 'checkbox'] ) && !e.disabled ) + if ( e.nodeName && e.nodeName.IEquals( 'input' ) && e.type.IEquals( ['radio', 'checkbox'] ) && !e.disabled ) { e.disabled = true ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcommands.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcommands.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcommands.js (revision 4268) @@ -143,4 +143,7 @@ case 'Undefined' : oCommand = new FCKUndefinedCommand() ; break ; + case 'Scayt' : oCommand = FCKScayt.CreateCommand() ; break ; + case 'ScaytContext' : oCommand = FCKScayt.CreateContextCommand() ; break ; + // By default we assume that it is a named command. default: Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js (revision 4268) @@ -98,5 +98,5 @@ else if ( sVal.length > 0 && !isNaN( sVal ) ) // If it is a number. - this.PageConfig[ sKey ] = parseInt( sVal, 10 ) ; + this.PageConfig[ sKey ] = parseFloat( sVal ) ; else // In any other case it is a string. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 4268) @@ -80,5 +80,5 @@ * Opens a dialog window using the standard dialog template. */ - OpenDialog : function( dialogName, dialogTitle, dialogPage, width, height, customValue, parentWindow, resizable ) + OpenDialog : function( dialogName, dialogTitle, dialogPage, width, height, customValue, resizable ) { if ( !topDialog ) Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js (revision 4268) @@ -489,16 +489,44 @@ for ( var i = 0 ; i < attributes.length ; i++ ) { - if ( FCKBrowserInfo.IsIE && attributes[i].nodeName == 'class' ) - { - // IE has a strange bug. If calling removeAttribute('className'), - // the attributes collection will still contain the "class" - // attribute, which will be marked as "specified", even if the - // outerHTML of the element is not displaying the class attribute. - // Note : I was not able to reproduce it outside the editor, - // but I've faced it while working on the TC of #1391. - if ( element.className.length > 0 ) - return true ; - } - else if ( attributes[i].specified ) + if ( FCKBrowserInfo.IsIE ) + { + var attributeNodeName = attributes[i].nodeName ; + + if ( attributeNodeName.StartsWith( '_fck' ) ) + { + /** + * There are places in the FCKeditor code where HTML element objects + * get values stored as properties (e.g. _fckxhtmljob). In Internet + * Explorer, these are interpreted as attempts to set attributes on + * the element. + * + * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr + * + * Counting these as HTML attributes cripples + * FCK.Style.RemoveFromRange() once FCK.GetData() has been called. + * + * The above conditional prevents these internal properties being + * counted as attributes. + * + * refs #2156 and #2834 + */ + + continue ; + } + + if ( attributeNodeName == 'class' ) + { + // IE has a strange bug. If calling removeAttribute('className'), + // the attributes collection will still contain the "class" + // attribute, which will be marked as "specified", even if the + // outerHTML of the element is not displaying the class attribute. + // Note : I was not able to reproduce it outside the editor, + // but I've faced it while working on the TC of #1391. + if ( element.className.length > 0 ) + return true ; + continue ; + } + } + if ( attributes[i].specified ) return true ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js (revision 4268) @@ -64,5 +64,5 @@ EmptyParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/ , -EmptyOutParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*| )(<\/\1>)?$/ , +EmptyOutParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*| | )(<\/\1>)?$/ , TagBody : /></ , Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckscayt.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckscayt.js (revision 4268) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckscayt.js (revision 4268) @@ -0,0 +1,447 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2009 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +var FCKScayt; + +(function() +{ + var scaytOnLoad = [] ; + var isEngineLoaded = ( FCK && FCK.EditorWindow && FCK.EditorWindow.parent.parent.scayt) + ? true : false ; + var scaytEnable = false; + var scaytReady = false; + + function ScaytEngineLoad( callback ) + { + if ( isEngineLoaded ) + return ; + + isEngineLoaded = true ; + var top = FCK.EditorWindow.parent.parent; + + var init = function () + { + window.scayt = top.scayt ; + InitScayt() ; + var ScaytCombobox = FCKToolbarItems.LoadedItems[ 'ScaytCombobox' ] ; + ScaytCombobox && ScaytCombobox.SetEnabled( scyt_control && scyt_control.disabled ) ; + InitSetup() ; + }; + + if ( top.scayt ) + { + init() ; + return ; + } + + // Compose the scayt url. + if (FCK.Config.ScaytCustomUrl) + FCK.Config.ScaytCustomUrl = new String(FCK.Config.ScaytCustomUrl).replace( new RegExp( "^http[s]*:\/\/"),"") ; + + var protocol = document.location.protocol ; + var baseUrl = FCK.Config.ScaytCustomUrl ||'svc.spellchecker.net/spellcheck3/lf/scayt/scayt4.js' ; + var scaytUrl = protocol + '//' + baseUrl ; + var scaytConfigBaseUrl = ParseUrl( scaytUrl ).path + '/' ; + + // SCAYT is targetted to CKEditor, so we need this trick to make it work here. + var CKEDITOR = top.window.CKEDITOR || ( top.window.CKEDITOR = {} ) ; + CKEDITOR._djScaytConfig = + { + baseUrl : scaytConfigBaseUrl, + addOnLoad : function() + { + init(); + }, + isDebug : false + }; + + + if ( callback ) + scaytOnLoad.push( callback ) ; + + DoLoadScript( scaytUrl ) ; + } + + /** + * DoLoadScript - load scripts with dinamic tag script creating + * @param string url + */ + function DoLoadScript( url ) + { + if (!url) + return false ; + var top = FCK.EditorWindow.parent.parent; + var s = top.document.createElement('script') ; + s.type = 'text/javascript' ; + s.src = url ; + top.document.getElementsByTagName('head')[0].appendChild(s) ; + + return true ; + } + + function ParseUrl( data ) + { + var m = data.match(/(.*)[\/\\]([^\/\\]+\.\w+)$/) ; + return m ? { path: m[1], file: m[2] } : data ; + } + + function createScaytControl () + { + // Get public scayt params. + var oParams = {} ; + var top = FCK.EditorWindow.parent.parent; + oParams.srcNodeRef = FCK.EditingArea.IFrame; // Get the iframe. + // syntax : AppName.AppVersion@AppRevision + //oParams.assocApp = "FCKEDITOR." + FCKeditorAPI.Varsion + "@" + FCKeditorAPI.VersionBuild; + oParams.customerid = FCK.Config.ScaytCustomerid ; + oParams.customDictionaryName = FCK.Config.ScaytCustomDictionaryName ; + oParams.userDictionaryName = FCK.Config.ScaytUserDictionaryName ; + oParams.defLang = FCK.Config.ScaytDefLang ; + + var scayt = top.scayt; + var scayt_control = window.scayt_control = new scayt( oParams ) ; + } + + function InitScayt() + { + createScaytControl(); + + var scayt_control = window.scayt_control ; + + if ( scayt_control ) + { + scayt_control.setDisabled( false ) ; + scaytReady = true; + scaytEnable = !scayt_control.disabled ; + + // set default scayt status + var ScaytCombobox = FCKToolbarItems.LoadedItems[ 'ScaytCombobox' ] ; + ScaytCombobox && ScaytCombobox.Enable() ; + ShowScaytState() ; + } + + for ( var i = 0 ; i < scaytOnLoad.length ; i++ ) + { + try + { + scaytOnLoad[i].call( this ) ; + } + catch(err) + {} + } + } + + // ### + // SCAYT command class. + var ScaytCommand = function() + { + name = 'Scayt' ; + } + + ScaytCommand.prototype.Execute = function( action ) + { + switch ( action ) + { + case 'Options' : + case 'Langs' : + case 'About' : + if ( isEngineLoaded && scaytReady && !scaytEnable ) + { + ScaytMessage( 'SCAYT is not enabled' ); + break; + } + + if ( isEngineLoaded && scaytReady ) + FCKDialog.OpenDialog( 'Scayt', 'SCAYT Settings', 'dialog/fck_scayt.html?' + action.toLowerCase(), 343, 343 ); + break; + + default : + if ( !isEngineLoaded ) + { + var me = this; + ScaytEngineLoad( function () + { + me.SetEnabled( !window.scayt_control.disabled ) ; + }) ; + + return true; + } + else if ( scaytReady ) + { + // Switch the current scayt state. + if ( scaytEnable ) + this.Disable() ; + else + this.Enable() ; + + ShowScaytState() ; + } + + } + + if ( !isEngineLoaded ) + return ScaytMessage( 'SCAYT is not loaded' ) || false; + + if ( !scaytReady ) + return ScaytMessage( 'SCAYT is not ready' ) || false; + + + return true; + } + + ScaytCommand.prototype.Enable = function() + { + window.scayt_control.setDisabled( false ) ; + scaytEnable = true; + } + + ScaytCommand.prototype.Disable = function() + { + window.scayt_control.setDisabled( true ) ; + scaytEnable = false; + } + + ScaytCommand.prototype.SetEnabled = function( state ) + { + if ( state ) + this.Enable() ; + else + this.Disable() ; + + ShowScaytState() ; + return true; + } + + ScaytCommand.prototype.GetState = function() + { + return FCK_TRISTATE_OFF; + } + + function ShowScaytState() + { + var combo = FCKToolbarItems.GetItem( 'SpellCheck' ) ; + + if ( !combo || !combo._Combo || !combo._Combo._OuterTable ) + return; + + var bItem = combo._Combo._OuterTable.getElementsByTagName( 'img' )[1] ; + var dNode = combo._Combo.Items['trigger'] ; + + if ( scaytEnable ) + { + bItem.style.opacity = '1' ; + dNode.innerHTML = GetStatusLabel() ; + } + else + { + bItem.style.opacity = '0.5' ; + dNode.innerHTML = GetStatusLabel() ; + } + } + + function GetStatusLabel() + { + if ( !scaytReady ) + return '<b>Enable SCAYT</b>' ; + + return scaytEnable ? '<b>Disable SCAYT</b>' : '<b>Enable SCAYT</b>' ; + } + + // ### + // Class for the toolbar item. + var ToolbarScaytComboBox = function( tooltip, style ) + { + this.Command = FCKCommands.GetCommand( 'Scayt' ) ; + this.CommandName = 'Scayt' ; + this.Label = this.GetLabel() ; + this.Tooltip = FCKLang.ScaytTitle ; + this.Style = FCK_TOOLBARITEM_ONLYTEXT ; //FCK_TOOLBARITEM_ICONTEXT OR FCK_TOOLBARITEM_ONLYTEXT + } + + ToolbarScaytComboBox.prototype = new FCKToolbarSpecialCombo ; + + //Add the items to the combo list + ToolbarScaytComboBox.prototype.CreateItems = function() + { + this._Combo.AddItem( 'Trigger', '<b>Enable SCAYT</b>' ); + this._Combo.AddItem( 'Options', FCKLang.ScaytTitleOptions || "Options" ); + this._Combo.AddItem( 'Langs', FCKLang.ScaytTitleLangs || "Languages"); + this._Combo.AddItem( 'About', FCKLang.ScaytTitleAbout || "About"); + } + + // Label shown in the toolbar. + ToolbarScaytComboBox.prototype.GetLabel = function() + { + var strip = FCKConfig.SkinPath + 'fck_strip.gif'; + + return FCKBrowserInfo.IsIE ? + '<div class="TB_Button_Image"><img src="' + strip + '" style="top:-192px"></div>' + : + '<img class="TB_Button_Image" src="' + FCK_SPACER_PATH + '" style="background-position: 0px -192px;background-image: url(' + strip + ');">'; + } + + function ScaytMessage( m ) + { + m && alert( m ) ; + } + + var ScaytContextCommand = function() + { + name = 'ScaytContext' ; + } + + ScaytContextCommand.prototype.Execute = function( contextInfo ) + { + var action = contextInfo && contextInfo.action, + node = action && contextInfo.node, + scayt_control = window.scayt_control; + + if ( node ) + { + switch ( action ) + { + case 'Suggestion' : + scayt_control.replace( node, contextInfo.suggestion ) ; + break ; + case 'Ignore' : + scayt_control.ignore( node ) ; + break ; + case 'Ignore All' : + scayt_control.ignoreAll( node ) ; + break ; + case 'Add Word' : + var top = FCK.EditorWindow.parent.parent ; + top.scayt.addWordToUserDictionary( node ) ; + break ; + } + } + } + + // Register context menu listeners. + function InitSetup() + { + FCK.ContextMenu.RegisterListener( + { + AddItems : function( menu ) + { + var top = FCK.EditorWindow.parent.parent; + + var scayt_control = window.scayt_control, + scayt = top.scayt; + + if ( !scayt_control ) + return; + + var node = scayt_control.getScaytNode() ; + + if ( !node ) + return; + + var suggestions = scayt.getSuggestion( scayt_control.getWord( node ), scayt_control.getLang() ) ; + + if ( !suggestions || !suggestions.length ) + return; + + menu.AddSeparator() ; + + var maxSuggestions = FCK.Config.ScaytMaxSuggestions || 5 ; + var suggAveCount = ( maxSuggestions == -1 ) ? suggestions.length : maxSuggestions ; + + for ( var i = 0 ; i < suggAveCount ; i += 1 ) + { + if ( suggestions[i] ) + { + menu.AddItem( 'ScaytContext', suggestions[i], null, false, { + 'action' : 'Suggestion', + 'node' : node, + 'suggestion' : suggestions[i] } ) ; + } + } + + menu.AddSeparator() ; + + menu.AddItem( 'ScaytContext', 'Ignore', null, false, { 'action' : 'Ignore', 'node' : node } ); + menu.AddItem( 'ScaytContext', 'Ignore All', null, false, { 'action' : 'Ignore All', 'node' : node } ); + menu.AddItem( 'ScaytContext', 'Add Word', null, false, { 'action' : 'Add Word', 'node' : node } ); + try + { + if (scaytReady && scaytEnable) + scayt_control.fireOnContextMenu( null, FCK.ContextMenu._InnerContextMenu); + + } + catch( err ) {} + } + }) ; + + FCK.Events.AttachEvent( 'OnPaste', function() + { + window.scayt_control.refresh() ; + return true; + } ) ; + } + + // ## + // Register event listeners. + + FCK.Events.AttachEvent( 'OnAfterSetHTML', function() + { + if ( FCKConfig.SpellChecker == 'SCAYT' ) + { + if ( !isEngineLoaded && FCK.Config.ScaytAutoStartup ) + ScaytEngineLoad() ; + + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG && isEngineLoaded && scaytReady ) + createScaytControl(); + + ShowScaytState() ; + } + } ) ; + + FCK.Events.AttachEvent( 'OnBeforeGetData', function() + { + scaytReady && window.scayt_control.reset(); + } ) ; + + FCK.Events.AttachEvent( 'OnAfterGetData', function() + { + scaytReady && window.scayt_control.refresh(); + } ) ; + + // ### + // The main object that holds the SCAYT interaction in the code. + FCKScayt = + { + CreateCommand : function() + { + return new ScaytCommand(); + }, + + CreateContextCommand : function() + { + return new ScaytContextCommand(); + }, + + CreateToolbarItem : function() + { + return new ToolbarScaytComboBox() ; + } + } ; +})() ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 4268) @@ -109,4 +109,5 @@ oRange = FCK.EditorDocument.body.createControlRange() ; oRange.addElement( node ) ; + oRange.select() ; } catch(e) @@ -115,7 +116,7 @@ oRange = FCK.EditorDocument.body.createTextRange() ; oRange.moveToElementText( node ) ; - } - - oRange.select() ; + oRange.select() ; + } + } ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbaritems.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbaritems.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbaritems.js (revision 4268) @@ -53,5 +53,4 @@ case 'PasteWord' : oItem = new FCKToolbarButton( 'PasteWord' , FCKLang.PasteWord, null, null, false, true, 11 ) ; break ; case 'Print' : oItem = new FCKToolbarButton( 'Print' , FCKLang.Print, null, null, false, true, 12 ) ; break ; - case 'SpellCheck' : oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck, null, null, null, null, 13 ) ; break ; case 'Undo' : oItem = new FCKToolbarButton( 'Undo' , FCKLang.Undo, null, null, false, true, 14 ) ; break ; case 'Redo' : oItem = new FCKToolbarButton( 'Redo' , FCKLang.Redo, null, null, false, true, 15 ) ; break ; @@ -114,4 +113,12 @@ case 'ShowBlocks' : oItem = new FCKToolbarButton( 'ShowBlocks' , FCKLang.ShowBlocks, null, null, null, true, 72 ) ; break ; + case 'SpellCheck' : + if ( FCKConfig.SpellChecker == 'SCAYT' ) + oItem = FCKScayt.CreateToolbarItem() ; + else + oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck, null, null, null, null, 13 ) ; + + break ; + default: alert( FCKLang.UnknownToolbarItem.replace( /%1/g, itemName ) ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbarset.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbarset.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbarset.js (revision 4268) @@ -240,5 +240,5 @@ this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ; - if ( FCKBrowserInfo.IsGecko ) + if ( window.onresize ) { // I had to use "setTimeout" because Gecko was not responding in a right Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 4268) @@ -56,4 +56,21 @@ else this._AppendChildNodes( this.MainNode, node, false ) ; + + /** + * FCKXHtml._AppendNode() marks DOM element objects it has + * processed by adding a property called _fckxhtmljob, + * setting it equal to the value of FCKXHtml.CurrentJobNum. + * On Internet Explorer, if an element object has such a + * property, it will show up in the object's attributes + * NamedNodeMap, and the corresponding Attr object in + * that collection will have is specified property set + * to true. This trips up code elsewhere that checks to + * see if an element is free of attributes before proceeding + * with an edit operation (c.f. FCK.Style.RemoveFromRange()) + * + * refs #2156 and #2834 + */ + if ( FCKBrowserInfo.IsIE ) + FCKXHtml._RemoveXHtmlJobProperties( node ) ; // Get the resulting XHTML as a string. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_ie.js (revision 4268) @@ -93,4 +93,40 @@ } +/** + * Used to clean up HTML that has been processed FCKXHtml._AppendNode(). + * + * For objects corresponding to HTML elements, Internet Explorer will + * treat a property as if it were an attribute set on that element. + * + * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr + * + * FCKXHtml._AppendNode() sets the property _fckxhtmljob on node objects + * corresponding HTML elements to mark them as having been processed. + * Counting these properties as attributes will cripple style removal + * because FCK.Styles.RemoveFromSelection() will not remove an element + * as long as it still has attributes. + * + * refs #2156 and #2834 + */ + +FCKXHtml._RemoveXHtmlJobProperties = function ( node ) +{ + // Select only nodes of type ELEMENT_NODE + if (!node || !node.nodeType || node.nodeType != 1) + return ; + + // Clear the _fckhtmljob attribute. + if ( typeof node._fckxhtmljob !== 'undefined' ) + node.removeAttribute('_fckxhtmljob') ; + + // Recurse upon child nodes. + if ( node.hasChildNodes() ) + { + var childNodes = node.childNodes ; + for ( var i = childNodes.length - 1 ; i >= 0 ; i-- ) + FCKXHtml._RemoveXHtmlJobProperties( childNodes.item(i) ) ; + } +} + // On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list) FCKXHtml.TagProcessors['div'] = function( node, htmlNode ) Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_about.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_about.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_about.html (revision 4268) @@ -147,9 +147,9 @@ if ( window.navigator.language ) - sUserLang = window.navigator.language.toLowerCase() ; + sUserLang = window.navigator.language ; else if ( window.navigator.userLanguage ) - sUserLang = window.navigator.userLanguage.toLowerCase() ; + sUserLang = window.navigator.userLanguage ; -document.write( '<b>User Language<\/b><br />' + sUserLang ) ; +document.write( '<b>Language<\/b><br />' + sUserLang ) ; //--> </script> Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html (revision 4268) @@ -22,9 +22,9 @@ * Link dialog window. --> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html> <head> <title>

Index: /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_dev/build_release.bat (revision 4268) @@ -26,5 +26,5 @@ :: Update this variable for each new release. -SET RELEASER_VERSION=2.6.4.1 +SET RELEASER_VERSION=2.6.5 CLS Index: /FCKeditor/branches/versions/2.6.x/_dev/lint.conf =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/lint.conf (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_dev/lint.conf (revision 4268) @@ -27,5 +27,5 @@ +useless_void # use of the void type may be unnecessary (void is always undefined) +multiple_plus_minus # unknown order of operations for successive plus (e.g. x+++y) or minus (e.g. x---y) signs -+use_of_label # use of label +-use_of_label # use of label -block_without_braces # block statement without curly braces +leading_decimal_point # leading decimal point may indicate a number or an object member Index: /FCKeditor/branches/versions/2.6.x/_dev/lint.mac.conf =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/lint.mac.conf (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_dev/lint.mac.conf (revision 4268) @@ -27,5 +27,5 @@ +useless_void # use of the void type may be unnecessary (void is always undefined) +multiple_plus_minus # unknown order of operations for successive plus (e.g. x+++y) or minus (e.g. x---y) signs -+use_of_label # use of label +-use_of_label # use of label -block_without_braces # block statement without curly braces +leading_decimal_point # leading decimal point may indicate a number or an object member Index: /FCKeditor/branches/versions/2.6.x/_dev/releaser/fckreleaser.php =================================================================== --- /FCKeditor/branches/versions/2.6.x/_dev/releaser/fckreleaser.php (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_dev/releaser/fckreleaser.php (revision 4268) @@ -966,4 +966,9 @@ } + // Fix invalid line breaks (must be all CRLF). + $data = preg_replace( + '/(?:(?Full Page Test<\/title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"><\/head><body><p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.<\/body><\/html>' ; +oFCKeditor.Value = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><title>Full Page Test<\/title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"><\/head><body><p>This is some <strong>sample text<\/strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor<\/a>.<\/body><\/html>' ; oFCKeditor.Create() ; //--> Index: /FCKeditor/branches/versions/2.6.x/_testcases/sampleposteddata.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/_testcases/sampleposteddata.asp (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_testcases/sampleposteddata.asp (revision 4268) @@ -47,5 +47,5 @@ <td valign="top" style="white-space: nowrap;"> <b> - <%=sForm%> + <%=Server.HTMLEncode(sForm)%> </b> </td> Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html (revision 4268) @@ -34,141 +34,71 @@ FCKeditor ChangeLog - What's New?</h1> <h3> - Version 2.6.4.1</h3> - <p> - Fixed Bugs:</p> - <ul> - <li><strong>Security release, upgrade is highly recommended.</strong></li> - </ul> - <h3> - Version 2.6.4</h3> - <p> - Fixed Bugs:</p> - <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2777">#2777</a>] Merging - cells between table header and body is no longer possible.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2815">#2815</a>] Fixed - WSC issues at slow connection speed. Added SSL support.</li> - <li>Language file updates for the following languages: - <ul> - <li>Chinese (Traditional)</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2846">#2846</a>] French</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2801">#2801</a>] Hebrew</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2824">#2824</a>] Russian</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2811">#2811</a>] Turkish</li> - </ul> - </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2757">#2757</a>] Fixed - a minor bug which causes selection positions to be improperly restored during undos - and redos.</li> - </ul> - <h3> - Version 2.6.4 Beta</h3> + Version 2.6.5</h3> <p> New Features and Improvements:</p> <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2685">#2685</a>] Integration - with "WebSpellChecker", a <strong>zero installation and free spell checker</strong> - provided by SpellChecker.net. This is now the default spell checker in the editor - (requires internet connection). All previous spell checking solutions are still - available.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2430">#2430</a>] In the - table dialog it's possible to create header cells in the first row (included in - a thead element) or the first column of the table. </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/822">#822</a>] The table - cell dialog allows switching between normal data cells or header cells (TD vs. TH). - </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2515">#2515</a>] New language - file for Icelandic.</li> + <li>Introduced the Spell Check As You Type (SCAYT) spell checking option.</li> </ul> <p> Fixed Bugs:</p> <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2381">#2381</a>] Protected - the editor from duplicate iframes</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1752">#1752</a>] Fixed - the issue with tablecommands plugin and undefined tagName.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The > - character inside text wasn't encoded in Opera and Safari.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed - JavaScript error with the fit window command in source mode.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2472">#2472</a>] Splitting - a TH will create a two TH, not a TH and a TD.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed - unnecessary name attributes in dialogs. </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, <a target="_blank" - href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was placed inside - a container with dimensions or floating it wasn't possible to edit its properties - from the toolbar or context menu.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1982">#1982</a>] Submenus - in IE7 now are shown properly.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using - the Paste dialogs in IE might insert the content at the start of the editor.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2349">#2496</a>] Fixed - RTL dialog layout in Internet Explorer.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed - the issue where email links in IE would take the browser to a new page in addition - to calling up the email client.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2519">#2519</a>] Fixed - race condition at registering the FCKeditorAPI object in multiple editor scenarios.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2525">#2525</a>] Fixed - JavaScript error in Google Chrome when StartupShowBlocks is set to true.</li> + <li><strong>Security release, upgrade is highly recommended</strong> (fixed security issues in ASP and ColdFusion scripts). + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2856">#2856</a>] Fixed + problem with inches in paste dialog.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3120">#3120</a>] + # (pound sign) is not correctly escaped in file urls.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2915">#2915</a>] + About plugin shows misleading user language.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2821">#2821</a>] Configuration + items that used floating point numbers were parsed as integers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2604">#2064</a>] The asp + connector didn't work correctly in windows 2000 servers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3429">#3429</a>] Fixed + problem in IE8 with XHTML doctype. Thanks to duncansimey.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3446">#3446</a>] Fixed self-closed + <option> in the table cell dialog.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3181">#3181</a>] Node selection + could raise an error in IE8.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2156">#2156</a>] + After calling GetData() the style removal operations didn't work in IE. Thanks to + Compendium Blogware.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3427">#3427</a>] Improved + compatibility of Document properties dialog with Eclipse.</li> <li>Language file updates for the following languages: <ul> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2440">#2440</a>] Dutch</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2451</a>] Basque</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2650</a>] Danish</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2208">#2535</a>] German - </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2908">#2908</a>] Czech </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2849">#2849</a>] Lithuanian</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3636">#3636</a>] Polish</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3741">#3741</a>] Korean</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2861">#2861</a>] Slovenian</li> </ul> </li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2531">#2531</a>] The ENTER - key will properly scroll to the cursor position when breaking long paragraphs.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2573">#2573</a>] The type - name in configurations for the ASP connector are now case sensitive.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2503">#2503</a>] DL, DT - and DD where missing the formatting in the generated HTML.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2516">#2516</a>] Replaced - the extension AddItem of Array with the standard "push" method.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically - splitting cell with colspan > 1 breaks table layout.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2597">#2597</a>] Fixed - the issue where dropping contents from outside of the editor doesn't work in Safari.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] Fixed - the issue where FCK.InsertHtml() is no longer removing selected contents after content - insertion in Firefox.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2407">#2407</a>] Fixed - the issue where the Div container command and the blockquote command would break - lists.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2469">#2469</a>] Fixed - a minor issue where FCK.SetData() may cause the editor to become unresponsive to - the first click after being defocused.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2611">#2611</a>] Fixed - an extra slash on quickupload of the asp connector.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2616">#2616</a>] Fixed - another situation where new elements were inserted at the beginning of the content - in IE.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2634">#2634</a>] Fixed - two obsolete references to Array::AddItem() instances still in the code.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2679">#2679</a>] Fixed - infinite loop problems with FCKDomRangeIterator class which causes some commands - to hang when applied to certain document structures.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2649">#2649</a>] Fixed - a JavaScript error in IE when user tries to search with the "Match whole word" option - enabled and the matched word is at exactly the end of document.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2603">#2603</a>] Changed - the <a href="http://docs.fckeditor.net/EMailProtection">EMailProtection</a> to "none" - for better compatibility.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2612">#2612</a>] The 'ForcePasteAsPlainText' - configuration option didn't work correctly in Safari and Chrome.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2696">#2696</a>] Fixed - non-working autogrow plugin.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2753">#2753</a>] Fixed - occasional exceptions in the dragersizetable plugin with IE.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2653">#2653</a>] and [<a - target="_blank" href="http://dev.fckeditor.net/ticket/2733">#2733</a>] Enable undo - of changes to tables and table cells.</li> - <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1865">#1865</a>] The context - menu is now working properly over the last row in a table with thead. Thanks to - Koen Willems.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3439">#3439</a>] IgnoreEmptyParagraphValue + had no effect if ProcessHTMLEntities is false.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3880">#3880</a>] Fixed some minor + logical and typing mistakes in fckdomrange_ie.js.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2689">#2689</a>] If a + custom connector tried to use the "url" attribute for files it was always reencoded.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1537">#1537</a>] Fixed extra + <p> tag added before pasted contents from Paste From Word dialog.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2874">#2874</a>] Fixed wrong position + of caption tag in tables with table headers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3818">#3818</a>] Fixed layout error + in text and background color popups when more colors button is disabled.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3481">#3481</a>] Fixed an issue in + WebKit where paste actions inside table cells may leak outside of the table cell.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3677">#3677</a>] Fixed JavaScript + error when trying to create link for images inside floating div containers.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3925">#3925</a>] Removed obsolete + parentWindow reference from FCKDialog.OpenDialog().</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2936">#2936</a>] Added protection + in the PHP upload if the destination folder is placed at the root and doesn't exit.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/4357">#4357</a>] Avoid problem in + the paste dialog if IIS is set to process HTML files as Asp.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2201">#2201</a>] Fixed a crash in IE + in an object is selected (with handles) on unload of the editor.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/3053">#3053</a>] Fixed problems with + the height of the content area in Safari and Chrome.</li> </ul> <p> Index: /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html (revision 4268) @@ -33,4 +33,143 @@ <h1> FCKeditor ChangeLog - What's New?</h1> + <h3> + Version 2.6.4.1</h3> + <p> + Fixed Bugs:</p> + <ul> + <li><strong>Security release, upgrade is highly recommended.</strong></li> + </ul> + <h3> + Version 2.6.4</h3> + <p> + Fixed Bugs:</p> + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2777">#2777</a>] Merging + cells between table header and body is no longer possible.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2815">#2815</a>] Fixed + WSC issues at slow connection speed. Added SSL support.</li> + <li>Language file updates for the following languages: + <ul> + <li>Chinese (Traditional)</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2846">#2846</a>] French</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2801">#2801</a>] Hebrew</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2824">#2824</a>] Russian</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2811">#2811</a>] Turkish</li> + </ul> + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2757">#2757</a>] Fixed + a minor bug which causes selection positions to be improperly restored during undos + and redos.</li> + </ul> + <h3> + Version 2.6.4 Beta</h3> + <p> + New Features and Improvements:</p> + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2685">#2685</a>] Integration + with "WebSpellChecker", a <strong>zero installation and free spell checker</strong> + provided by SpellChecker.net. This is now the default spell checker in the editor + (requires internet connection). All previous spell checking solutions are still + available.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2430">#2430</a>] In the + table dialog it's possible to create header cells in the first row (included in + a thead element) or the first column of the table. </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/822">#822</a>] The table + cell dialog allows switching between normal data cells or header cells (TD vs. TH). + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2515">#2515</a>] New language + file for Icelandic.</li> + </ul> + <p> + Fixed Bugs:</p> + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2381">#2381</a>] Protected + the editor from duplicate iframes</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1752">#1752</a>] Fixed + the issue with tablecommands plugin and undefined tagName.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2333">#2333</a>] The > + character inside text wasn't encoded in Opera and Safari.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2467">#2467</a>] Fixed + JavaScript error with the fit window command in source mode.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2472">#2472</a>] Splitting + a TH will create a two TH, not a TH and a TD.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1891">#1891</a>] Removed + unnecessary name attributes in dialogs. </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/798">#798</a>, <a target="_blank" + href="http://dev.fckeditor.net/ticket/2495">#2495</a>] If an image was placed inside + a container with dimensions or floating it wasn't possible to edit its properties + from the toolbar or context menu.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1982">#1982</a>] Submenus + in IE7 now are shown properly.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2496">#2496</a>] Using + the Paste dialogs in IE might insert the content at the start of the editor.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2349">#2496</a>] Fixed + RTL dialog layout in Internet Explorer.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2488">#2488</a>] Fixed + the issue where email links in IE would take the browser to a new page in addition + to calling up the email client.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2519">#2519</a>] Fixed + race condition at registering the FCKeditorAPI object in multiple editor scenarios.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2525">#2525</a>] Fixed + JavaScript error in Google Chrome when StartupShowBlocks is set to true.</li> + <li>Language file updates for the following languages: + <ul> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2440">#2440</a>] Dutch</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2451</a>] Basque</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2451">#2650</a>] Danish</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2208">#2535</a>] German + </li> + </ul> + </li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2531">#2531</a>] The ENTER + key will properly scroll to the cursor position when breaking long paragraphs.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2573">#2573</a>] The type + name in configurations for the ASP connector are now case sensitive.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2503">#2503</a>] DL, DT + and DD where missing the formatting in the generated HTML.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2516">#2516</a>] Replaced + the extension AddItem of Array with the standard "push" method.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2486">#2486</a>] Vertically + splitting cell with colspan > 1 breaks table layout.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2597">#2597</a>] Fixed + the issue where dropping contents from outside of the editor doesn't work in Safari.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2412">#2412</a>] Fixed + the issue where FCK.InsertHtml() is no longer removing selected contents after content + insertion in Firefox.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2407">#2407</a>] Fixed + the issue where the Div container command and the blockquote command would break + lists.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2469">#2469</a>] Fixed + a minor issue where FCK.SetData() may cause the editor to become unresponsive to + the first click after being defocused.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2611">#2611</a>] Fixed + an extra slash on quickupload of the asp connector.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2616">#2616</a>] Fixed + another situation where new elements were inserted at the beginning of the content + in IE.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2634">#2634</a>] Fixed + two obsolete references to Array::AddItem() instances still in the code.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2679">#2679</a>] Fixed + infinite loop problems with FCKDomRangeIterator class which causes some commands + to hang when applied to certain document structures.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2649">#2649</a>] Fixed + a JavaScript error in IE when user tries to search with the "Match whole word" option + enabled and the matched word is at exactly the end of document.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2603">#2603</a>] Changed + the <a href="http://docs.fckeditor.net/EMailProtection">EMailProtection</a> to "none" + for better compatibility.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2612">#2612</a>] The 'ForcePasteAsPlainText' + configuration option didn't work correctly in Safari and Chrome.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2696">#2696</a>] Fixed + non-working autogrow plugin.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2753">#2753</a>] Fixed + occasional exceptions in the dragersizetable plugin with IE.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2653">#2653</a>] and [<a + target="_blank" href="http://dev.fckeditor.net/ticket/2733">#2733</a>] Enable undo + of changes to tables and table cells.</li> + <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1865">#1865</a>] The context + menu is now working properly over the last row in a table with thead. Thanks to + Koen Willems.</li> + </ul> <h3> Version 2.6.3</h3> Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckdomrange_ie.js (revision 4268) @@ -78,5 +78,5 @@ { var bIsCollapsed = this.CheckIsCollapsed() ; - var bIsStartMakerAlone ; + var bIsStartMarkerAlone ; var dummySpan ; @@ -112,5 +112,5 @@ else { - bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ; + bIsStartMarkerAlone = forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br'; // Append a temporary <span></span> before the selection. @@ -123,5 +123,5 @@ eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ; - if ( bIsStartMakerAlone ) + if ( bIsStartMarkerAlone ) { // To expand empty blocks or line spaces after <br>, we need @@ -142,5 +142,5 @@ if ( bIsCollapsed ) { - if ( bIsStartMakerAlone ) + if ( bIsStartMarkerAlone ) { // Move the selection start to include the temporary . Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckeditingarea.js (revision 4268) @@ -356,5 +356,9 @@ { if ( this.Document ) + { + // Avoid IE crash if an object is selected on unload #2201 + this.Document.selection.empty() ; this.Document.body.innerHTML = "" ; + } this.TargetElement = null ; this.IFrame = null ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/classes/fckpanel.js (revision 4268) @@ -234,4 +234,7 @@ } + // Save the popup related arguments so they can be used by others (e.g. SCAYT). + this._PopupArgs = [x, y, iMainWidth, eMainNode.offsetHeight, relElement]; + // Second call: Show the Popup at the specified location, with the correct size. this._Popup.show( x, y, iMainWidth, eMainNode.offsetHeight, relElement ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fck_othercommands.js (revision 4268) @@ -41,5 +41,5 @@ FCKDialogCommand.prototype.Execute = function() { - FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, null, this.Resizable ) ; + FCKDialog.OpenDialog( 'FCKDialog_' + this.Name , this.Title, this.Url, this.Width, this.Height, this.CustomValue, this.Resizable ) ; } @@ -187,5 +187,5 @@ var iWidth = FCKConfig.ScreenWidth * 0.65 ; var iHeight = FCKConfig.ScreenHeight * 0.65 ; - FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, null, true ) ; + FCKDialog.OpenDialog( 'FCKDialog_Source', FCKLang.Source, 'dialog/fck_source.html', iWidth, iHeight, null, true ) ; } else Index: /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fcktextcolorcommand.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/commandclasses/fcktextcolorcommand.js (revision 4268) @@ -194,8 +194,8 @@ FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_MoreOnClick, this ) ; - } - - // Dirty hack for Opera, Safari and Firefox 3. - if ( !FCKBrowserInfo.IsIE ) - oDiv.style.width = '96%' ; -} + + // Dirty hack for Opera, Safari and Firefox 3. + if ( !FCKBrowserInfo.IsIE ) + oDiv.style.width = '96%' ; + } +} Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck.js (revision 4268) @@ -236,4 +236,6 @@ GetData : function( format ) { + FCK.Events.FireEvent("OnBeforeGetData") ; + // We assume that if the user is in source editing, the editor value must // represent the exact contents of the source, as the user wanted it to be. @@ -271,5 +273,9 @@ } - return FCKConfig.ProtectedSource.Revert( data ) ; + data = FCKConfig.ProtectedSource.Revert( data ) ; + + setTimeout( function() { FCK.Events.FireEvent("OnAfterGetData") ; }, 0 ) ; + + return data ; }, @@ -495,5 +501,5 @@ } - if ( FCKBrowserInfo.IsGecko ) + if ( window.onresize ) window.onresize() ; }, @@ -958,4 +964,36 @@ FCKTools.AddEventListener( FCK.EditorDocument, 'mousedown', _FCK_MouseEventsListener ) ; FCKTools.AddEventListener( FCK.EditorDocument, 'mouseup', _FCK_MouseEventsListener ) ; + if ( FCKBrowserInfo.IsSafari ) + { + // #3481: WebKit has a bug with paste where the paste contents may leak + // outside table cells. So add padding nodes before and after the paste. + FCKTools.AddEventListener( FCK.EditorDocument, 'paste', function( evt ) + { + var range = new FCKDomRange( FCK.EditorWindow ); + var nodeBefore = FCK.EditorDocument.createTextNode( '\ufeff' ); + var nodeAfter = FCK.EditorDocument.createElement( 'a' ); + nodeAfter.id = 'fck_paste_padding'; + nodeAfter.innerHTML = ''; + range.MoveToSelection(); + range.DeleteContents(); + + // Insert padding nodes. + range.InsertNode( nodeBefore ); + range.Collapse(); + range.InsertNode( nodeAfter ); + + // Move the selection to between the padding nodes. + range.MoveToPosition( nodeAfter, 3 ); + range.Select(); + + // Remove the padding nodes after the paste is done. + setTimeout( function() + { + nodeBefore.parentNode.removeChild( nodeBefore ); + nodeAfter = FCK.EditorDocument.getElementById( 'fck_paste_padding' ); + nodeAfter.parentNode.removeChild( nodeAfter ); + }, 0 ); + } ); + } // Most of the CTRL key combos do not work under Safari for onkeydown and onkeypress (See #1119) Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_gecko.js (revision 4268) @@ -376,4 +376,14 @@ range = new FCKDomRange( this.EditorWindow ) ; range.MoveToSelection() ; + + // If the first element (if exists) of the document fragment is a block + // element, then split the current block. (#1537) + var currentNode = docFrag.RootNode.firstChild ; + while ( currentNode && currentNode.nodeType != 1 ) + currentNode = currentNode.nextSibling ; + + if ( currentNode && FCKListsLib.BlockElements[ currentNode.nodeName.toLowerCase() ] ) + range.SplitBlock() ; + range.DeleteContents() ; range.InsertNode( docFrag.RootNode ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fck_ie.js (revision 4268) @@ -173,5 +173,10 @@ // Remove the fake node - FCK.EditorDocument.getElementById('__fakeFCKRemove__').removeNode( true ) ; + var fake = FCK.EditorDocument.getElementById('__fakeFCKRemove__') ; + // If the span is the only child of a node (so the inserted HTML is beyond that), + // remove also that parent that isn't needed. #1537 + if (fake.parentNode.childNodes.length == 1) + fake = fake.parentNode ; + fake.removeNode( true ) ; FCKDocumentProcessor.Process( FCK.EditorDocument ) ; @@ -374,7 +379,12 @@ // Creates the array that will be returned. It contains one or more created links (see #220). var aCreatedLinks = new Array() ; + var isControl = FCKSelection.GetType() == 'Control' ; + var selectedElement = isControl && FCKSelection.GetSelectedElement() ; // Remove any existing link in the selection. - FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ; + // IE BUG: Unlinking a floating control selection that is not inside a link + // will collapse the selection. (#3677) + if ( !( isControl && !FCKTools.GetElementAscensor( selectedElement, 'a' ) ) ) + FCK.ExecuteNamedCommand( 'Unlink', null, false, !!noUndo ) ; if ( url.length > 0 ) @@ -382,5 +392,5 @@ // If there are several images, and you try to link each one, all the images get inside the link: // <img><img> -> <a><img></a><img> -> <a><img><img></a> due to the call to 'CreateLink' (bug in IE) - if (FCKSelection.GetType() == 'Control') + if ( isControl ) { // Create a link @@ -389,5 +399,5 @@ // Get the selected object - var oControl = FCKSelection.GetSelectedElement() ; + var oControl = selectedElement ; // Put the link just before the object oControl.parentNode.insertBefore(oLink, oControl) ; @@ -449,5 +459,5 @@ // in editable mode. Otherwise the whole browser window may be locked by // the buttons. (#1782) - if ( e.nodeName.IEquals( 'input' ) && e.type.IEquals( ['radio', 'checkbox'] ) && !e.disabled ) + if ( e.nodeName && e.nodeName.IEquals( 'input' ) && e.type.IEquals( ['radio', 'checkbox'] ) && !e.disabled ) { e.disabled = true ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcommands.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcommands.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckcommands.js (revision 4268) @@ -143,4 +143,7 @@ case 'Undefined' : oCommand = new FCKUndefinedCommand() ; break ; + case 'Scayt' : oCommand = FCKScayt.CreateCommand() ; break ; + case 'ScaytContext' : oCommand = FCKScayt.CreateContextCommand() ; break ; + // By default we assume that it is a named command. default: Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckconfig.js (revision 4268) @@ -98,5 +98,5 @@ else if ( sVal.length > 0 && !isNaN( sVal ) ) // If it is a number. - this.PageConfig[ sKey ] = parseInt( sVal, 10 ) ; + this.PageConfig[ sKey ] = parseFloat( sVal ) ; else // In any other case it is a string. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdialog.js (revision 4268) @@ -80,5 +80,5 @@ * Opens a dialog window using the standard dialog template. */ - OpenDialog : function( dialogName, dialogTitle, dialogPage, width, height, customValue, parentWindow, resizable ) + OpenDialog : function( dialogName, dialogTitle, dialogPage, width, height, customValue, resizable ) { if ( !topDialog ) Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckdomtools.js (revision 4268) @@ -489,16 +489,44 @@ for ( var i = 0 ; i < attributes.length ; i++ ) { - if ( FCKBrowserInfo.IsIE && attributes[i].nodeName == 'class' ) - { - // IE has a strange bug. If calling removeAttribute('className'), - // the attributes collection will still contain the "class" - // attribute, which will be marked as "specified", even if the - // outerHTML of the element is not displaying the class attribute. - // Note : I was not able to reproduce it outside the editor, - // but I've faced it while working on the TC of #1391. - if ( element.className.length > 0 ) - return true ; - } - else if ( attributes[i].specified ) + if ( FCKBrowserInfo.IsIE ) + { + var attributeNodeName = attributes[i].nodeName ; + + if ( attributeNodeName.StartsWith( '_fck' ) ) + { + /** + * There are places in the FCKeditor code where HTML element objects + * get values stored as properties (e.g. _fckxhtmljob). In Internet + * Explorer, these are interpreted as attempts to set attributes on + * the element. + * + * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr + * + * Counting these as HTML attributes cripples + * FCK.Style.RemoveFromRange() once FCK.GetData() has been called. + * + * The above conditional prevents these internal properties being + * counted as attributes. + * + * refs #2156 and #2834 + */ + + continue ; + } + + if ( attributeNodeName == 'class' ) + { + // IE has a strange bug. If calling removeAttribute('className'), + // the attributes collection will still contain the "class" + // attribute, which will be marked as "specified", even if the + // outerHTML of the element is not displaying the class attribute. + // Note : I was not able to reproduce it outside the editor, + // but I've faced it while working on the TC of #1391. + if ( element.className.length > 0 ) + return true ; + continue ; + } + } + if ( attributes[i].specified ) return true ; } Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckregexlib.js (revision 4268) @@ -64,5 +64,5 @@ EmptyParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>\s*(<\/\1>)?$/ , -EmptyOutParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*| )(<\/\1>)?$/ , +EmptyOutParagraph : /^<(p|div|address|h\d|center)(?=[ >])[^>]*>(?:\s*| | )(<\/\1>)?$/ , TagBody : /></ , Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckscayt.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckscayt.js (revision 4268) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckscayt.js (revision 4268) @@ -0,0 +1,447 @@ +/* + * FCKeditor - The text editor for Internet - http://www.fckeditor.net + * Copyright (C) 2003-2009 Frederico Caldeira Knabben + * + * == BEGIN LICENSE == + * + * Licensed under the terms of any of the following licenses at your + * choice: + * + * - GNU General Public License Version 2 or later (the "GPL") + * http://www.gnu.org/licenses/gpl.html + * + * - GNU Lesser General Public License Version 2.1 or later (the "LGPL") + * http://www.gnu.org/licenses/lgpl.html + * + * - Mozilla Public License Version 1.1 or later (the "MPL") + * http://www.mozilla.org/MPL/MPL-1.1.html + * + * == END LICENSE == + */ + +var FCKScayt; + +(function() +{ + var scaytOnLoad = [] ; + var isEngineLoaded = ( FCK && FCK.EditorWindow && FCK.EditorWindow.parent.parent.scayt) + ? true : false ; + var scaytEnable = false; + var scaytReady = false; + + function ScaytEngineLoad( callback ) + { + if ( isEngineLoaded ) + return ; + + isEngineLoaded = true ; + var top = FCK.EditorWindow.parent.parent; + + var init = function () + { + window.scayt = top.scayt ; + InitScayt() ; + var ScaytCombobox = FCKToolbarItems.LoadedItems[ 'ScaytCombobox' ] ; + ScaytCombobox && ScaytCombobox.SetEnabled( scyt_control && scyt_control.disabled ) ; + InitSetup() ; + }; + + if ( top.scayt ) + { + init() ; + return ; + } + + // Compose the scayt url. + if (FCK.Config.ScaytCustomUrl) + FCK.Config.ScaytCustomUrl = new String(FCK.Config.ScaytCustomUrl).replace( new RegExp( "^http[s]*:\/\/"),"") ; + + var protocol = document.location.protocol ; + var baseUrl = FCK.Config.ScaytCustomUrl ||'svc.spellchecker.net/spellcheck3/lf/scayt/scayt4.js' ; + var scaytUrl = protocol + '//' + baseUrl ; + var scaytConfigBaseUrl = ParseUrl( scaytUrl ).path + '/' ; + + // SCAYT is targetted to CKEditor, so we need this trick to make it work here. + var CKEDITOR = top.window.CKEDITOR || ( top.window.CKEDITOR = {} ) ; + CKEDITOR._djScaytConfig = + { + baseUrl : scaytConfigBaseUrl, + addOnLoad : function() + { + init(); + }, + isDebug : false + }; + + + if ( callback ) + scaytOnLoad.push( callback ) ; + + DoLoadScript( scaytUrl ) ; + } + + /** + * DoLoadScript - load scripts with dinamic tag script creating + * @param string url + */ + function DoLoadScript( url ) + { + if (!url) + return false ; + var top = FCK.EditorWindow.parent.parent; + var s = top.document.createElement('script') ; + s.type = 'text/javascript' ; + s.src = url ; + top.document.getElementsByTagName('head')[0].appendChild(s) ; + + return true ; + } + + function ParseUrl( data ) + { + var m = data.match(/(.*)[\/\\]([^\/\\]+\.\w+)$/) ; + return m ? { path: m[1], file: m[2] } : data ; + } + + function createScaytControl () + { + // Get public scayt params. + var oParams = {} ; + var top = FCK.EditorWindow.parent.parent; + oParams.srcNodeRef = FCK.EditingArea.IFrame; // Get the iframe. + // syntax : AppName.AppVersion@AppRevision + //oParams.assocApp = "FCKEDITOR." + FCKeditorAPI.Varsion + "@" + FCKeditorAPI.VersionBuild; + oParams.customerid = FCK.Config.ScaytCustomerid ; + oParams.customDictionaryName = FCK.Config.ScaytCustomDictionaryName ; + oParams.userDictionaryName = FCK.Config.ScaytUserDictionaryName ; + oParams.defLang = FCK.Config.ScaytDefLang ; + + var scayt = top.scayt; + var scayt_control = window.scayt_control = new scayt( oParams ) ; + } + + function InitScayt() + { + createScaytControl(); + + var scayt_control = window.scayt_control ; + + if ( scayt_control ) + { + scayt_control.setDisabled( false ) ; + scaytReady = true; + scaytEnable = !scayt_control.disabled ; + + // set default scayt status + var ScaytCombobox = FCKToolbarItems.LoadedItems[ 'ScaytCombobox' ] ; + ScaytCombobox && ScaytCombobox.Enable() ; + ShowScaytState() ; + } + + for ( var i = 0 ; i < scaytOnLoad.length ; i++ ) + { + try + { + scaytOnLoad[i].call( this ) ; + } + catch(err) + {} + } + } + + // ### + // SCAYT command class. + var ScaytCommand = function() + { + name = 'Scayt' ; + } + + ScaytCommand.prototype.Execute = function( action ) + { + switch ( action ) + { + case 'Options' : + case 'Langs' : + case 'About' : + if ( isEngineLoaded && scaytReady && !scaytEnable ) + { + ScaytMessage( 'SCAYT is not enabled' ); + break; + } + + if ( isEngineLoaded && scaytReady ) + FCKDialog.OpenDialog( 'Scayt', 'SCAYT Settings', 'dialog/fck_scayt.html?' + action.toLowerCase(), 343, 343 ); + break; + + default : + if ( !isEngineLoaded ) + { + var me = this; + ScaytEngineLoad( function () + { + me.SetEnabled( !window.scayt_control.disabled ) ; + }) ; + + return true; + } + else if ( scaytReady ) + { + // Switch the current scayt state. + if ( scaytEnable ) + this.Disable() ; + else + this.Enable() ; + + ShowScaytState() ; + } + + } + + if ( !isEngineLoaded ) + return ScaytMessage( 'SCAYT is not loaded' ) || false; + + if ( !scaytReady ) + return ScaytMessage( 'SCAYT is not ready' ) || false; + + + return true; + } + + ScaytCommand.prototype.Enable = function() + { + window.scayt_control.setDisabled( false ) ; + scaytEnable = true; + } + + ScaytCommand.prototype.Disable = function() + { + window.scayt_control.setDisabled( true ) ; + scaytEnable = false; + } + + ScaytCommand.prototype.SetEnabled = function( state ) + { + if ( state ) + this.Enable() ; + else + this.Disable() ; + + ShowScaytState() ; + return true; + } + + ScaytCommand.prototype.GetState = function() + { + return FCK_TRISTATE_OFF; + } + + function ShowScaytState() + { + var combo = FCKToolbarItems.GetItem( 'SpellCheck' ) ; + + if ( !combo || !combo._Combo || !combo._Combo._OuterTable ) + return; + + var bItem = combo._Combo._OuterTable.getElementsByTagName( 'img' )[1] ; + var dNode = combo._Combo.Items['trigger'] ; + + if ( scaytEnable ) + { + bItem.style.opacity = '1' ; + dNode.innerHTML = GetStatusLabel() ; + } + else + { + bItem.style.opacity = '0.5' ; + dNode.innerHTML = GetStatusLabel() ; + } + } + + function GetStatusLabel() + { + if ( !scaytReady ) + return '<b>Enable SCAYT</b>' ; + + return scaytEnable ? '<b>Disable SCAYT</b>' : '<b>Enable SCAYT</b>' ; + } + + // ### + // Class for the toolbar item. + var ToolbarScaytComboBox = function( tooltip, style ) + { + this.Command = FCKCommands.GetCommand( 'Scayt' ) ; + this.CommandName = 'Scayt' ; + this.Label = this.GetLabel() ; + this.Tooltip = FCKLang.ScaytTitle ; + this.Style = FCK_TOOLBARITEM_ONLYTEXT ; //FCK_TOOLBARITEM_ICONTEXT OR FCK_TOOLBARITEM_ONLYTEXT + } + + ToolbarScaytComboBox.prototype = new FCKToolbarSpecialCombo ; + + //Add the items to the combo list + ToolbarScaytComboBox.prototype.CreateItems = function() + { + this._Combo.AddItem( 'Trigger', '<b>Enable SCAYT</b>' ); + this._Combo.AddItem( 'Options', FCKLang.ScaytTitleOptions || "Options" ); + this._Combo.AddItem( 'Langs', FCKLang.ScaytTitleLangs || "Languages"); + this._Combo.AddItem( 'About', FCKLang.ScaytTitleAbout || "About"); + } + + // Label shown in the toolbar. + ToolbarScaytComboBox.prototype.GetLabel = function() + { + var strip = FCKConfig.SkinPath + 'fck_strip.gif'; + + return FCKBrowserInfo.IsIE ? + '<div class="TB_Button_Image"><img src="' + strip + '" style="top:-192px"></div>' + : + '<img class="TB_Button_Image" src="' + FCK_SPACER_PATH + '" style="background-position: 0px -192px;background-image: url(' + strip + ');">'; + } + + function ScaytMessage( m ) + { + m && alert( m ) ; + } + + var ScaytContextCommand = function() + { + name = 'ScaytContext' ; + } + + ScaytContextCommand.prototype.Execute = function( contextInfo ) + { + var action = contextInfo && contextInfo.action, + node = action && contextInfo.node, + scayt_control = window.scayt_control; + + if ( node ) + { + switch ( action ) + { + case 'Suggestion' : + scayt_control.replace( node, contextInfo.suggestion ) ; + break ; + case 'Ignore' : + scayt_control.ignore( node ) ; + break ; + case 'Ignore All' : + scayt_control.ignoreAll( node ) ; + break ; + case 'Add Word' : + var top = FCK.EditorWindow.parent.parent ; + top.scayt.addWordToUserDictionary( node ) ; + break ; + } + } + } + + // Register context menu listeners. + function InitSetup() + { + FCK.ContextMenu.RegisterListener( + { + AddItems : function( menu ) + { + var top = FCK.EditorWindow.parent.parent; + + var scayt_control = window.scayt_control, + scayt = top.scayt; + + if ( !scayt_control ) + return; + + var node = scayt_control.getScaytNode() ; + + if ( !node ) + return; + + var suggestions = scayt.getSuggestion( scayt_control.getWord( node ), scayt_control.getLang() ) ; + + if ( !suggestions || !suggestions.length ) + return; + + menu.AddSeparator() ; + + var maxSuggestions = FCK.Config.ScaytMaxSuggestions || 5 ; + var suggAveCount = ( maxSuggestions == -1 ) ? suggestions.length : maxSuggestions ; + + for ( var i = 0 ; i < suggAveCount ; i += 1 ) + { + if ( suggestions[i] ) + { + menu.AddItem( 'ScaytContext', suggestions[i], null, false, { + 'action' : 'Suggestion', + 'node' : node, + 'suggestion' : suggestions[i] } ) ; + } + } + + menu.AddSeparator() ; + + menu.AddItem( 'ScaytContext', 'Ignore', null, false, { 'action' : 'Ignore', 'node' : node } ); + menu.AddItem( 'ScaytContext', 'Ignore All', null, false, { 'action' : 'Ignore All', 'node' : node } ); + menu.AddItem( 'ScaytContext', 'Add Word', null, false, { 'action' : 'Add Word', 'node' : node } ); + try + { + if (scaytReady && scaytEnable) + scayt_control.fireOnContextMenu( null, FCK.ContextMenu._InnerContextMenu); + + } + catch( err ) {} + } + }) ; + + FCK.Events.AttachEvent( 'OnPaste', function() + { + window.scayt_control.refresh() ; + return true; + } ) ; + } + + // ## + // Register event listeners. + + FCK.Events.AttachEvent( 'OnAfterSetHTML', function() + { + if ( FCKConfig.SpellChecker == 'SCAYT' ) + { + if ( !isEngineLoaded && FCK.Config.ScaytAutoStartup ) + ScaytEngineLoad() ; + + if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG && isEngineLoaded && scaytReady ) + createScaytControl(); + + ShowScaytState() ; + } + } ) ; + + FCK.Events.AttachEvent( 'OnBeforeGetData', function() + { + scaytReady && window.scayt_control.reset(); + } ) ; + + FCK.Events.AttachEvent( 'OnAfterGetData', function() + { + scaytReady && window.scayt_control.refresh(); + } ) ; + + // ### + // The main object that holds the SCAYT interaction in the code. + FCKScayt = + { + CreateCommand : function() + { + return new ScaytCommand(); + }, + + CreateContextCommand : function() + { + return new ScaytContextCommand(); + }, + + CreateToolbarItem : function() + { + return new ToolbarScaytComboBox() ; + } + } ; +})() ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckselection_ie.js (revision 4268) @@ -109,4 +109,5 @@ oRange = FCK.EditorDocument.body.createControlRange() ; oRange.addElement( node ) ; + oRange.select() ; } catch(e) @@ -115,7 +116,7 @@ oRange = FCK.EditorDocument.body.createTextRange() ; oRange.moveToElementText( node ) ; - } - - oRange.select() ; + oRange.select() ; + } + } ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbaritems.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbaritems.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbaritems.js (revision 4268) @@ -53,5 +53,4 @@ case 'PasteWord' : oItem = new FCKToolbarButton( 'PasteWord' , FCKLang.PasteWord, null, null, false, true, 11 ) ; break ; case 'Print' : oItem = new FCKToolbarButton( 'Print' , FCKLang.Print, null, null, false, true, 12 ) ; break ; - case 'SpellCheck' : oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck, null, null, null, null, 13 ) ; break ; case 'Undo' : oItem = new FCKToolbarButton( 'Undo' , FCKLang.Undo, null, null, false, true, 14 ) ; break ; case 'Redo' : oItem = new FCKToolbarButton( 'Redo' , FCKLang.Redo, null, null, false, true, 15 ) ; break ; @@ -114,4 +113,12 @@ case 'ShowBlocks' : oItem = new FCKToolbarButton( 'ShowBlocks' , FCKLang.ShowBlocks, null, null, null, true, 72 ) ; break ; + case 'SpellCheck' : + if ( FCKConfig.SpellChecker == 'SCAYT' ) + oItem = FCKScayt.CreateToolbarItem() ; + else + oItem = new FCKToolbarButton( 'SpellCheck', FCKLang.SpellCheck, null, null, null, null, 13 ) ; + + break ; + default: alert( FCKLang.UnknownToolbarItem.replace( /%1/g, itemName ) ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbarset.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbarset.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fcktoolbarset.js (revision 4268) @@ -240,5 +240,5 @@ this._Document.getElementById( 'xExpanded' ).style.display = collapse ? 'none' : '' ; - if ( FCKBrowserInfo.IsGecko ) + if ( window.onresize ) { // I had to use "setTimeout" because Gecko was not responding in a right Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml.js (revision 4268) @@ -56,4 +56,21 @@ else this._AppendChildNodes( this.MainNode, node, false ) ; + + /** + * FCKXHtml._AppendNode() marks DOM element objects it has + * processed by adding a property called _fckxhtmljob, + * setting it equal to the value of FCKXHtml.CurrentJobNum. + * On Internet Explorer, if an element object has such a + * property, it will show up in the object's attributes + * NamedNodeMap, and the corresponding Attr object in + * that collection will have is specified property set + * to true. This trips up code elsewhere that checks to + * see if an element is free of attributes before proceeding + * with an edit operation (c.f. FCK.Style.RemoveFromRange()) + * + * refs #2156 and #2834 + */ + if ( FCKBrowserInfo.IsIE ) + FCKXHtml._RemoveXHtmlJobProperties( node ) ; // Get the resulting XHTML as a string. Index: /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_ie.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_ie.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/_source/internals/fckxhtml_ie.js (revision 4268) @@ -93,4 +93,40 @@ } +/** + * Used to clean up HTML that has been processed FCKXHtml._AppendNode(). + * + * For objects corresponding to HTML elements, Internet Explorer will + * treat a property as if it were an attribute set on that element. + * + * http://msdn.microsoft.com/en-us/library/ms533026(VS.85).aspx#Accessing_Element_Pr + * + * FCKXHtml._AppendNode() sets the property _fckxhtmljob on node objects + * corresponding HTML elements to mark them as having been processed. + * Counting these properties as attributes will cripple style removal + * because FCK.Styles.RemoveFromSelection() will not remove an element + * as long as it still has attributes. + * + * refs #2156 and #2834 + */ + +FCKXHtml._RemoveXHtmlJobProperties = function ( node ) +{ + // Select only nodes of type ELEMENT_NODE + if (!node || !node.nodeType || node.nodeType != 1) + return ; + + // Clear the _fckhtmljob attribute. + if ( typeof node._fckxhtmljob !== 'undefined' ) + node.removeAttribute('_fckxhtmljob') ; + + // Recurse upon child nodes. + if ( node.hasChildNodes() ) + { + var childNodes = node.childNodes ; + for ( var i = childNodes.length - 1 ; i >= 0 ; i-- ) + FCKXHtml._RemoveXHtmlJobProperties( childNodes.item(i) ) ; + } +} + // On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list) FCKXHtml.TagProcessors['div'] = function( node, htmlNode ) Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_about.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_about.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_about.html (revision 4268) @@ -147,9 +147,9 @@ if ( window.navigator.language ) - sUserLang = window.navigator.language.toLowerCase() ; + sUserLang = window.navigator.language ; else if ( window.navigator.userLanguage ) - sUserLang = window.navigator.userLanguage.toLowerCase() ; + sUserLang = window.navigator.userLanguage ; -document.write( '<b>User Language<\/b><br />' + sUserLang ) ; +document.write( '<b>Language<\/b><br />' + sUserLang ) ; //--> </script> Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_docprops.html (revision 4268) @@ -22,9 +22,9 @@ * Link dialog window. --> -<html xmlns="http://www.w3.org/1999/xhtml"> +<html> <head> <title> - - + + + + + + +

+ +

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

+ +

+ + +

+ + + + +

+ +

+ + Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_scayt/scayt_dialog.css =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_scayt/scayt_dialog.css (revision 4268) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_scayt/scayt_dialog.css (revision 4268) @@ -0,0 +1,169 @@ +html, body +{ + background-color: transparent; + margin: 0px; + padding: 0px; +} + +body +{ + padding: 10px; +} + +body, td, input, select, textarea +{ + font-size: 11px; + font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana; +} + +.midtext +{ + padding:0px; + margin:10px; +} + +.midtext p +{ + padding:0px; + margin:10px; +} + +.Button +{ + border: #737357 1px solid; + color: #3b3b1f; + background-color: #c7c78f; +} + +.PopupTabArea , .button +{ + color: #737357; + background-color: #e3e3c7; +} + +.PopupTitleBorder +{ + border-bottom: #d5d59d 1px solid; +} +.PopupTabEmptyArea +{ + padding-left: 10px; + border-bottom: #d5d59d 1px solid; +} + +.PopupTab, .PopupTabSelected +{ + border-right: #d5d59d 1px solid; + border-top: #d5d59d 1px solid; + border-left: #d5d59d 1px solid; + padding: 3px 5px 3px 5px; + color: #737357; +} + +.PopupTab +{ + margin-top: 1px; + border-bottom: #d5d59d 1px solid; + cursor: pointer; + cursor: hand; +} + +.PopupTabSelected +{ + font-weight: bold; + cursor: default; + padding-top: 4px; + border-bottom: #f1f1e3 1px solid; + background-color: #f1f1e3; +} + +ul { + padding:0; + margin:0px 0px 12px 0px; + list-style-type:none; +} +ul.tabs { + height:20px; + margin:10px 0px; +} +ul.tabs li { + float: left; + display:none; +} +div.tab_container { + /*display:none;*/ + padding: 0px 5px ; +} +.lcol { + float:left; + width:47%; + margin-left:5px; +} +.rcol { + float:right; + width:47%; + margin-right:5px; +} +div.tabs-container{ + height:220px; + overflow-x:hidden; + overflow-y:auto; +} + +div.tabs-container h3{ + margin:5px 15px 7px 15px; + background-color:transparent; + font-size: 14px ; +} + +.li { + border: 1px solid transparent; +} + +#dic_message{ + height: 24px; +} +#dic_message .error{ + color: red ; +} +#dic_message .success{ + color: blue ; +} + +.dic_buttons { + margin-top: 5px; + padding-left:10px; +} +.dic_buttons a { + display: none; +} +a.button { + border: #d5d59d 1px solid; + padding: 2px 4px; + margin-right: 4px; + text-decoration: none; +} + +a.button:hover, +a.button:active, +a.button:visited{ + padding: 2px 4px; + margin-right: 4px; + text-decoration: none; +} +a.button:hover { + border: #d5d59d 1px solid; + color: #e3e3c7; + background-color: #737357; +} + +#scayt_options li { + display: none; +} + +#dic_info { + margin:10px; +} +#dic_tab { + display:none; +} Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_table.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_table.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_table.html (revision 4268) @@ -156,9 +156,142 @@ SetAttribute( table, 'summary' , GetE('txtSummary').value ) ; + var headers = GetE('selHeaders').value ; + if ( bExists ) + { + // Should we make a ? + if ( table.tHead==null && (headers=='row' || headers=='both') ) + { + var oThead = table.createTHead() ; + var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ; + var theRow= FCKDomTools.GetFirstChild( tbody, 'TR' ) ; + + //now change TD to TH: + for (var i = 0; i ? + if (headers=='row' || headers=='both') + { + startRow++ ; + var oThead = table.createTHead() ; + var oRow = table.insertRow(-1) ; + oThead.appendChild(oRow); + + for ( var c = 0 ; c < iCols ; c++ ) + { + var oThcell = oDoc.createElement( 'TH' ) ; + oThcell.scope = 'col' ; + oRow.appendChild( oThcell ) ; + if ( oEditor.FCKBrowserInfo.IsGeckoLike ) + oEditor.FCKTools.AppendBogusBr( oThcell ) ; + } + } + + // Opera automatically creates a tbody when a thead has been added + var oTbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ; + if ( !oTbody ) + { + // make TBODY if it doesn't exist + oTbody = oDoc.createElement( 'TBODY' ) ; + table.appendChild( oTbody ) ; + } + for ( var r = startRow ; r < iRows; r++ ) + { + var oRow = oDoc.createElement( 'TR' ) ; + oTbody.appendChild(oRow) ; + + var startCol = 0 ; + // Is the first column a header? + if (headers=='col' || headers=='both') + { + var oThcell = oDoc.createElement( 'TH' ) ; + oThcell.scope = 'row' ; + oRow.appendChild( oThcell ) ; + if ( oEditor.FCKBrowserInfo.IsGeckoLike ) + oEditor.FCKTools.AppendBogusBr( oThcell ) ; + + startCol++ ; + } + for ( var c = startCol ; c < iCols ; c++ ) + { + // IE will leave the TH at the end of the row if we use now oRow.insertCell(-1) + var oCell = oDoc.createElement( 'TD' ) ; + oRow.appendChild( oCell ) ; + if ( oEditor.FCKBrowserInfo.IsGeckoLike ) + oEditor.FCKTools.AppendBogusBr( oCell ) ; + } + } + + oEditor.FCK.InsertElement( table ) ; + } + var eCaption = oEditor.FCKDomTools.GetFirstChild( table, 'CAPTION' ) ; - if ( document.getElementById('txtCaption').value != '') + if ( eCaption && !oEditor.FCKBrowserInfo.IsIE ) + eCaption.parentNode.removeChild( eCaption ) ; + + if ( document.getElementById('txtCaption').value != '' ) { - if ( !eCaption ) + if ( !eCaption || !oEditor.FCKBrowserInfo.IsIE ) { eCaption = oDoc.createElement( 'CAPTION' ) ; @@ -174,136 +307,4 @@ if ( oEditor.FCKBrowserInfo.IsIE ) eCaption.innerHTML = '' ; - else - eCaption.parentNode.removeChild( eCaption ) ; - } - - var headers = GetE('selHeaders').value ; - if ( bExists ) - { - // Should we make a ? - if ( table.tHead==null && (headers=='row' || headers=='both') ) - { - var oThead = table.createTHead() ; - var tbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ; - var theRow= FCKDomTools.GetFirstChild( tbody, 'TR' ) ; - - //now change TD to TH: - for (var i = 0; i ? - if (headers=='row' || headers=='both') - { - startRow++ ; - var oThead = table.createTHead() ; - var oRow = table.insertRow(-1) ; - oThead.appendChild(oRow); - - for ( var c = 0 ; c < iCols ; c++ ) - { - var oThcell = oDoc.createElement( 'TH' ) ; - oThcell.scope = 'col' ; - oRow.appendChild( oThcell ) ; - if ( oEditor.FCKBrowserInfo.IsGeckoLike ) - oEditor.FCKTools.AppendBogusBr( oThcell ) ; - } - } - - // Opera automatically creates a tbody when a thead has been added - var oTbody = FCKDomTools.GetFirstChild( table, 'TBODY' ) ; - if ( !oTbody ) - { - // make TBODY if it doesn't exist - oTbody = oDoc.createElement( 'TBODY' ) ; - table.appendChild( oTbody ) ; - } - for ( var r = startRow ; r < iRows; r++ ) - { - var oRow = oDoc.createElement( 'TR' ) ; - oTbody.appendChild(oRow) ; - - var startCol = 0 ; - // Is the first column a header? - if (headers=='col' || headers=='both') - { - var oThcell = oDoc.createElement( 'TH' ) ; - oThcell.scope = 'row' ; - oRow.appendChild( oThcell ) ; - if ( oEditor.FCKBrowserInfo.IsGeckoLike ) - oEditor.FCKTools.AppendBogusBr( oThcell ) ; - - startCol++ ; - } - for ( var c = startCol ; c < iCols ; c++ ) - { - // IE will leave the TH at the end of the row if we use now oRow.insertCell(-1) - var oCell = oDoc.createElement( 'TD' ) ; - oRow.appendChild( oCell ) ; - if ( oEditor.FCKBrowserInfo.IsGeckoLike ) - oEditor.FCKTools.AppendBogusBr( oCell ) ; - } - } - - oEditor.FCK.InsertElement( table ) ; } Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_tablecell.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_tablecell.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_tablecell.html (revision 4268) @@ -140,5 +140,5 @@ function SelectColor( wich ) { - oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, wich == 'Back' ? SelectBackColor : SelectBorderColor, window ) ; + oEditor.FCKDialog.OpenDialog( 'FCKDialog_Color', oEditor.FCKLang.DlgColorTitle, 'dialog/fck_colorselector.html', 410, 320, wich == 'Back' ? SelectBackColor : SelectBorderColor ) ; } @@ -225,6 +225,6 @@ Index: /FCKeditor/branches/versions/2.6.x/editor/fckeditor.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/fckeditor.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/fckeditor.html (revision 4268) @@ -203,4 +203,5 @@ LoadScript( '_source/classes/fcktoolbarfontsizecombo.js' ) ; LoadScript( '_source/classes/fcktoolbarpanelbutton.js' ) ; +LoadScript( '_source/internals/fckscayt.js' ) ; LoadScript( '_source/internals/fcktoolbaritems.js' ) ; LoadScript( '_source/classes/fcktoolbar.js' ) ; @@ -373,14 +374,14 @@ } -// Gecko browsers doesn't calculate well the IFRAME size so we must +// Gecko and Webkit browsers don't calculate well the IFRAME size so we must // recalculate it every time the window size changes. -if ( FCKBrowserInfo.IsGecko && !FCKBrowserInfo.IsOpera ) +if ( FCKBrowserInfo.IsGecko || FCKBrowserInfo.IsSafari ) { window.onresize = function( e ) { - // Running in Chrome makes the window receive the event including subframes. + // Running in Firefox's chrome makes the window receive the event including subframes. // we care only about this window. Ticket #1642. // #2002: The originalTarget from the event can be the current document, the window, or the editing area. - if ( e && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document )) + if ( e && e.originalTarget && e.originalTarget !== document && e.originalTarget !== window && (!e.originalTarget.ownerDocument || e.originalTarget.ownerDocument != document )) return ; Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmresourceslist.html =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmresourceslist.html (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/browser/default/frmresourceslist.html (revision 4268) @@ -90,5 +90,5 @@ function OpenFile( fileUrl ) { - window.top.opener.SetUrl( encodeURI( fileUrl ).replace( '#', '%23' ) ) ; + window.top.opener.SetUrl( fileUrl ) ; window.top.close() ; window.top.opener.focus() ; @@ -146,5 +146,5 @@ // Get the optional "url" attribute. If not available, build the url. var oFileUrlAtt = oNodes[j].attributes.getNamedItem('url') ; - var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : sCurrentFolderUrl + sFileName ; + var sFileUrl = oFileUrlAtt != null ? oFileUrlAtt.value : encodeURI( sCurrentFolderUrl + sFileName ).replace( /#/g, '%23' ) ; oHtml.Append( oListManager.GetFileRowHtml( sFileName, sFileUrl, sFileSize ) ) ; Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/basexml.asp =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/basexml.asp (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/asp/basexml.asp (revision 4268) @@ -31,5 +31,9 @@ ' Set the response format. + on error resume next + ' The CodePage property isn't supported in Windows 2000. #2604 Response.CodePage = 65001 + on error goto 0 + Response.CharSet = "UTF-8" Response.ContentType = "text/xml" Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_connector.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_connector.cfm (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_connector.cfm (revision 4268) @@ -36,4 +36,9 @@ ---> + + + + + @@ -42,4 +47,5 @@ + @@ -197,5 +203,5 @@ - + Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_upload.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_upload.cfm (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf5_upload.cfm (revision 4268) @@ -36,13 +36,24 @@ ---> + + + + + + + + + + + - + @@ -76,10 +87,10 @@ - + ])', url.currentFolder)> - + @@ -199,5 +210,5 @@ - + @@ -217,8 +228,14 @@ + + + + + + + + @@ -234,10 +253,7 @@ - - - errorNumber = 0; @@ -259,30 +275,29 @@ // When the original filename already exists, add numbers (0), (1), (2), ... at the end of the filename. - if( compare( cffile.ServerFileName, fileName ) ) { - counter = 0; - tmpFileName = fileName; - while( fileExists("#currentFolderPath##fileName#.#fileExt#") ) { - fileExisted = true ; - counter = counter + 1 ; - fileName = tmpFileName & '(#counter#)' ; - } + counter = 0; + tmpFileName = fileName; + while( fileExists("#currentFolderPath##fileName#.#fileExt#") ) { + fileExisted = true ; + counter = counter + 1 ; + fileName = tmpFileName & '(#counter#)' ; } - - - - - - - - + + + + + + + + + + + + + + Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_commands.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_commands.cfm (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/cf_commands.cfm (revision 4268) @@ -109,5 +109,15 @@ - + + + + + + + + + + + Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/config.cfm =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/config.cfm (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/cfm/config.cfm (revision 4268) @@ -62,5 +62,20 @@ //(used by MX 6.0 and above) Config.TempDirectory = GetTempDirectory(); + + + + + + + + + + + + + + + // Configuration settings for each Resource Type // @@ -134,55 +149,2 @@ Config.QuickUploadAbsolutePath["Media"] = Config.FileTypesAbsolutePath["Media"] ; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - function structCopyKeys(stFrom, stTo) { - for ( key in stFrom ) { - if ( isStruct(stFrom[key]) ) { - structCopyKeys(stFrom[key],stTo[key]); - } else { - stTo[key] = stFrom[key]; - } - } - } - structCopyKeys(FCKeditor, config); - - - Index: /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/php/io.php =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/php/io.php (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/filemanager/connectors/php/io.php (revision 4268) @@ -99,5 +99,5 @@ // Check if the parent exists, or create it. - if ( !file_exists( $sParent ) ) + if ( !empty($sParent) && !file_exists( $sParent ) ) { //prevents agains infinite loop when we can't create root folder Index: /FCKeditor/branches/versions/2.6.x/editor/lang/_translationstatus.txt =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/_translationstatus.txt (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/_translationstatus.txt (revision 4268) @@ -1,3 +1,3 @@ -/* +/* * FCKeditor - The text editor for Internet - http://www.fckeditor.net * Copyright (C) 2003-2009 Frederico Caldeira Knabben @@ -22,58 +22,58 @@ */ -af.js Found: 396 Missing: 32 -ar.js Found: 420 Missing: 8 -bg.js Found: 373 Missing: 55 -bn.js Found: 380 Missing: 48 -bs.js Found: 226 Missing: 202 -ca.js Found: 420 Missing: 8 -cs.js Found: 420 Missing: 8 -da.js Found: 419 Missing: 9 -de.js Found: 420 Missing: 8 -el.js Found: 396 Missing: 32 -en-au.js Found: 423 Missing: 5 -en-ca.js Found: 423 Missing: 5 -en-uk.js Found: 423 Missing: 5 -eo.js Found: 346 Missing: 82 -es.js Found: 428 Missing: 0 -et.js Found: 411 Missing: 17 -eu.js Found: 420 Missing: 8 -fa.js Found: 413 Missing: 15 -fi.js Found: 411 Missing: 17 -fo.js Found: 420 Missing: 8 -fr-ca.js Found: 419 Missing: 9 -fr.js Found: 428 Missing: 0 -gl.js Found: 381 Missing: 47 -gu.js Found: 411 Missing: 17 -he.js Found: 428 Missing: 0 -hi.js Found: 420 Missing: 8 -hr.js Found: 420 Missing: 8 -hu.js Found: 411 Missing: 17 -is.js Found: 428 Missing: 0 -it.js Found: 410 Missing: 18 -ja.js Found: 420 Missing: 8 -km.js Found: 370 Missing: 58 -ko.js Found: 390 Missing: 38 -lt.js Found: 376 Missing: 52 -lv.js Found: 381 Missing: 47 -mn.js Found: 411 Missing: 17 -ms.js Found: 352 Missing: 76 -nb.js Found: 414 Missing: 14 -nl.js Found: 420 Missing: 8 -no.js Found: 414 Missing: 14 -pl.js Found: 411 Missing: 17 -pt-br.js Found: 411 Missing: 17 -pt.js Found: 381 Missing: 47 -ro.js Found: 410 Missing: 18 -ru.js Found: 427 Missing: 1 -sk.js Found: 420 Missing: 8 -sl.js Found: 411 Missing: 17 -sr-latn.js Found: 368 Missing: 60 -sr.js Found: 368 Missing: 60 -sv.js Found: 409 Missing: 19 -th.js Found: 393 Missing: 35 -tr.js Found: 428 Missing: 0 -uk.js Found: 419 Missing: 9 -vi.js Found: 419 Missing: 9 -zh-cn.js Found: 428 Missing: 0 -zh.js Found: 423 Missing: 5 +af.js Found: 396 Missing: 36 +ar.js Found: 420 Missing: 12 +bg.js Found: 373 Missing: 59 +bn.js Found: 380 Missing: 52 +bs.js Found: 226 Missing: 206 +ca.js Found: 420 Missing: 12 +cs.js Found: 428 Missing: 4 +da.js Found: 419 Missing: 13 +de.js Found: 420 Missing: 12 +el.js Found: 396 Missing: 36 +en-au.js Found: 423 Missing: 9 +en-ca.js Found: 423 Missing: 9 +en-uk.js Found: 423 Missing: 9 +eo.js Found: 346 Missing: 86 +es.js Found: 428 Missing: 4 +et.js Found: 411 Missing: 21 +eu.js Found: 420 Missing: 12 +fa.js Found: 413 Missing: 19 +fi.js Found: 411 Missing: 21 +fo.js Found: 420 Missing: 12 +fr-ca.js Found: 419 Missing: 13 +fr.js Found: 428 Missing: 4 +gl.js Found: 381 Missing: 51 +gu.js Found: 411 Missing: 21 +he.js Found: 428 Missing: 4 +hi.js Found: 420 Missing: 12 +hr.js Found: 420 Missing: 12 +hu.js Found: 411 Missing: 21 +is.js Found: 428 Missing: 4 +it.js Found: 410 Missing: 22 +ja.js Found: 420 Missing: 12 +km.js Found: 370 Missing: 62 +ko.js Found: 391 Missing: 41 +lt.js Found: 428 Missing: 4 +lv.js Found: 381 Missing: 51 +mn.js Found: 411 Missing: 21 +ms.js Found: 352 Missing: 80 +nb.js Found: 414 Missing: 18 +nl.js Found: 420 Missing: 12 +no.js Found: 414 Missing: 18 +pl.js Found: 412 Missing: 20 +pt-br.js Found: 411 Missing: 21 +pt.js Found: 381 Missing: 51 +ro.js Found: 410 Missing: 22 +ru.js Found: 427 Missing: 5 +sk.js Found: 420 Missing: 12 +sl.js Found: 426 Missing: 6 +sr-latn.js Found: 368 Missing: 64 +sr.js Found: 368 Missing: 64 +sv.js Found: 409 Missing: 23 +th.js Found: 393 Missing: 39 +tr.js Found: 428 Missing: 4 +uk.js Found: 419 Missing: 13 +vi.js Found: 419 Missing: 13 +zh-cn.js Found: 428 Missing: 4 +zh.js Found: 423 Missing: 9 Index: /FCKeditor/branches/versions/2.6.x/editor/lang/af.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/af.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/af.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ar.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ar.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ar.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "متقدم", DlgDivStyle : "المظهر", -DlgDivInlineStyle : "المظهر المضمن" +DlgDivInlineStyle : "المظهر المضمن", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/bg.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/bg.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/bg.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/bn.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/bn.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/bn.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/bs.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/bs.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/bs.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ca.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ca.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ca.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avançat", DlgDivStyle : "Estil", -DlgDivInlineStyle : "Estil en línia" +DlgDivInlineStyle : "Estil en línia", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/cs.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/cs.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/cs.js (revision 4268) @@ -309,9 +309,9 @@ DlgTableCaption : "Popis", DlgTableSummary : "Souhrn", -DlgTableHeaders : "Headers", //MISSING -DlgTableHeadersNone : "None", //MISSING -DlgTableHeadersColumn : "First column", //MISSING -DlgTableHeadersRow : "First Row", //MISSING -DlgTableHeadersBoth : "Both", //MISSING +DlgTableHeaders : "Záhlaví", +DlgTableHeadersNone : "Žádné", +DlgTableHeadersColumn : "První sloupec", +DlgTableHeadersRow : "První řádek", +DlgTableHeadersBoth : "Oboje", // Table Cell Dialog @@ -336,7 +336,7 @@ DlgCellVerAlignBottom : "Dolů", DlgCellVerAlignBaseline : "Na účaří", -DlgCellType : "Cell Type", //MISSING -DlgCellTypeData : "Data", //MISSING -DlgCellTypeHeader : "Header", //MISSING +DlgCellType : "Typ buňky", +DlgCellTypeData : "Data", +DlgCellTypeHeader : "Zálaví", DlgCellRowSpan : "Sloučené řádky", DlgCellCollSpan : "Sloučené sloupce", @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Rozšířené", DlgDivStyle : "Styl", -DlgDivInlineStyle : "Vložený styl" +DlgDivInlineStyle : "Vložený styl", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/da.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/da.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/da.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avanceret", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline style" +DlgDivInlineStyle : "Inline style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/de.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/de.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/de.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Erweitert", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/el.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/el.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/el.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/en-au.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/en-au.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/en-au.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/en-ca.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/en-ca.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/en-ca.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/en-uk.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/en-uk.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/en-uk.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/en.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/en.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/en.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +ScaytTitle : "SCAYT", +ScaytTitleOptions : "Options", +ScaytTitleLangs : "Languages", +ScaytTitleAbout : "About" }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/eo.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/eo.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/eo.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/es.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/es.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/es.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avanzado", DlgDivStyle : "Estilo", -DlgDivInlineStyle : "Estilos CSS" +DlgDivInlineStyle : "Estilos CSS", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/et.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/et.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/et.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/eu.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/eu.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/eu.js (revision 4268) @@ -532,4 +532,9 @@ DlgDivAdvancedTab : "Aurreratua", DlgDivStyle : "Estiloa", -DlgDivInlineStyle : "Inline Estiloa" +DlgDivInlineStyle : "Inline Estiloa", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/fa.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/fa.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/fa.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/fi.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/fi.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/fi.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/fo.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/fo.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/fo.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Fjølbroytt", DlgDivStyle : "Typografi", -DlgDivInlineStyle : "Inline typografi" +DlgDivInlineStyle : "Inline typografi", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/fr-ca.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/fr-ca.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/fr-ca.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avancé", DlgDivStyle : "Style", -DlgDivInlineStyle : "Attribut Style" +DlgDivInlineStyle : "Attribut Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/fr.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/fr.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/fr.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avancé", DlgDivStyle : "Style", -DlgDivInlineStyle : "Attribut Style" +DlgDivInlineStyle : "Attribut Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/gl.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/gl.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/gl.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/gu.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/gu.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/gu.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/he.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/he.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/he.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "מתקדם", DlgDivStyle : "סגנון", -DlgDivInlineStyle : "סגנון בתוך השורה" +DlgDivInlineStyle : "סגנון בתוך השורה", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/hi.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/hi.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/hi.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "एड्वान्स्ड", DlgDivStyle : "स्टाइल", -DlgDivInlineStyle : "इनलाइन स्टाइल" +DlgDivInlineStyle : "इनलाइन स्टाइल", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/hr.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/hr.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/hr.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Napredno", DlgDivStyle : "Stil", -DlgDivInlineStyle : "Stil u redu" +DlgDivInlineStyle : "Stil u redu", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/hu.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/hu.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/hu.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/is.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/is.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/is.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Sérhæft", DlgDivStyle : "Stíll", -DlgDivInlineStyle : "Línulægur stíll" +DlgDivInlineStyle : "Línulægur stíll", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/it.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/it.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/it.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ja.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ja.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ja.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "高度な設定", DlgDivStyle : "スタイル", -DlgDivInlineStyle : "インラインスタイル" +DlgDivInlineStyle : "インラインスタイル", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/km.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/km.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/km.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ko.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ko.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ko.js (revision 4268) @@ -308,5 +308,5 @@ DlgTableCellPad : "셀 여백", DlgTableCaption : "캡션", -DlgTableSummary : "Summary", //MISSING +DlgTableSummary : "요약", DlgTableHeaders : "Headers", //MISSING DlgTableHeadersNone : "None", //MISSING @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/lt.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/lt.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/lt.js (revision 4268) @@ -45,7 +45,7 @@ InsertLink : "Įterpti/taisyti nuorodą", RemoveLink : "Panaikinti nuorodą", -VisitLink : "Open Link", //MISSING +VisitLink : "Atidaryti nuorodą", Anchor : "Įterpti/modifikuoti žymę", -AnchorDelete : "Remove Anchor", //MISSING +AnchorDelete : "Naikinti žymę", InsertImageLbl : "Vaizdas", InsertImage : "Įterpti/taisyti vaizdą", @@ -73,8 +73,8 @@ DecreaseIndent : "Sumažinti įtrauką", IncreaseIndent : "Padidinti įtrauką", -Blockquote : "Blockquote", //MISSING -CreateDiv : "Create Div Container", //MISSING -EditDiv : "Edit Div Container", //MISSING -DeleteDiv : "Remove Div Container", //MISSING +Blockquote : "Citata", +CreateDiv : "Sukurti Div elementą", +EditDiv : "Reaguoti Div elementą", +DeleteDiv : "Šalinti Div elementą", Undo : "Atšaukti", Redo : "Atstatyti", @@ -109,26 +109,26 @@ ImageButton : "Vaizdinis mygtukas", -FitWindow : "Maximize the editor size", //MISSING -ShowBlocks : "Show Blocks", //MISSING +FitWindow : "Padidinti redaktorių", +ShowBlocks : "Rodyti blokus", // Context Menu EditLink : "Taisyti nuorodą", -CellCM : "Cell", //MISSING -RowCM : "Row", //MISSING -ColumnCM : "Column", //MISSING -InsertRowAfter : "Insert Row After", //MISSING -InsertRowBefore : "Insert Row Before", //MISSING +CellCM : "Langelis", +RowCM : "Eilutė", +ColumnCM : "Stulpelis", +InsertRowAfter : "Įterpti eilutę po", +InsertRowBefore : "Įterpti eilutę prieš", DeleteRows : "Šalinti eilutes", -InsertColumnAfter : "Insert Column After", //MISSING -InsertColumnBefore : "Insert Column Before", //MISSING +InsertColumnAfter : "Įterpti stulpelį po", +InsertColumnBefore : "Įterpti stulpelį prieš", DeleteColumns : "Šalinti stulpelius", -InsertCellAfter : "Insert Cell After", //MISSING -InsertCellBefore : "Insert Cell Before", //MISSING +InsertCellAfter : "Įterpti langelį po", +InsertCellBefore : "Įterpti langelį prieš", DeleteCells : "Šalinti langelius", MergeCells : "Sujungti langelius", -MergeRight : "Merge Right", //MISSING -MergeDown : "Merge Down", //MISSING -HorizontalSplitCell : "Split Cell Horizontally", //MISSING -VerticalSplitCell : "Split Cell Vertically", //MISSING +MergeRight : "Sujungti su dešine", +MergeDown : "Sujungti su apačia", +HorizontalSplitCell : "Skaidyti langelį horizontaliai", +VerticalSplitCell : "Skaidyti langelį vertikaliai", TableDelete : "Šalinti lentelę", CellProperties : "Langelio savybės", @@ -162,5 +162,5 @@ BrowseServerBlocked : "Neįmanoma atidaryti naujo naršyklės lango. Įsitikinkite, kad iškylančių langų blokavimo programos neveiksnios.", DialogBlocked : "Neįmanoma atidaryti dialogo lango. Įsitikinkite, kad iškylančių langų blokavimo programos neveiksnios.", -VisitLinkBlocked : "It was not possible to open a new window. Make sure all popup blockers are disabled.", //MISSING +VisitLinkBlocked : "Neįmanoma atidaryti naujo lango. Įsitikinkite, kad iškylančių langų blokavimo programos neveiksnios.", // Dialogs @@ -277,5 +277,5 @@ DlnLnkMsgNoEMail : "Prašome įvesti el.pašto adresą", DlnLnkMsgNoAnchor : "Prašome pasirinkti žymę", -DlnLnkMsgInvPopName : "The popup name must begin with an alphabetic character and must not contain spaces", //MISSING +DlnLnkMsgInvPopName : "Iššokančio lango pavadinimas privalo prasidėti lotyniška raide ir negali turėti tarpų", // Color Dialog @@ -309,9 +309,9 @@ DlgTableCaption : "Antraštė", DlgTableSummary : "Santrauka", -DlgTableHeaders : "Headers", //MISSING -DlgTableHeadersNone : "None", //MISSING -DlgTableHeadersColumn : "First column", //MISSING -DlgTableHeadersRow : "First Row", //MISSING -DlgTableHeadersBoth : "Both", //MISSING +DlgTableHeaders : "Antraštės", +DlgTableHeadersNone : "Nėra", +DlgTableHeadersColumn : "Pirmas stulpelis", +DlgTableHeadersRow : "Pirma eilutė", +DlgTableHeadersBoth : "Abu", // Table Cell Dialog @@ -336,7 +336,7 @@ DlgCellVerAlignBottom : "Apačią", DlgCellVerAlignBaseline : "Apatinę liniją", -DlgCellType : "Cell Type", //MISSING -DlgCellTypeData : "Data", //MISSING -DlgCellTypeHeader : "Header", //MISSING +DlgCellType : "Langelio tipas", +DlgCellTypeData : "Duomenys", +DlgCellTypeHeader : "Antraštė", DlgCellRowSpan : "Eilučių apjungimas", DlgCellCollSpan : "Stulpelių apjungimas", @@ -346,5 +346,5 @@ // Find and Replace Dialog -DlgFindAndReplaceTitle : "Find and Replace", //MISSING +DlgFindAndReplaceTitle : "Surasti ir pakeisti", // Find Dialog @@ -369,6 +369,6 @@ PasteFromWord : "Įdėti iš Word", -DlgPasteMsg2 : "Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (Ctrl+V) ir spūstelkite mygtuką OK.", -DlgPasteSec : "Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.", //MISSING +DlgPasteMsg2 : "Žemiau esančiame įvedimo lauke įdėkite tekstą, naudodami klaviatūrą (Ctrl+V) ir paspauskite mygtuką OK.", +DlgPasteSec : "Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kartą į šį langą.", DlgPasteIgnoreFont : "Ignoruoti šriftų nustatymus", DlgPasteRemoveStyles : "Pašalinti stilių nustatymus", @@ -406,7 +406,7 @@ DlgButtonText : "Tekstas (Reikšmė)", DlgButtonType : "Tipas", -DlgButtonTypeBtn : "Button", //MISSING -DlgButtonTypeSbm : "Submit", //MISSING -DlgButtonTypeRst : "Reset", //MISSING +DlgButtonTypeBtn : "Mygtukas", +DlgButtonTypeSbm : "Siųsti", +DlgButtonTypeRst : "Išvalyti", // Checkbox and Radio Button Dialogs @@ -457,5 +457,5 @@ BulletedListProp : "Suženklinto sąrašo savybės", NumberedListProp : "Numeruoto sąrašo savybės", -DlgLstStart : "Start", //MISSING +DlgLstStart : "Pradėti nuo", DlgLstType : "Tipas", DlgLstTypeCircle : "Apskritimas", @@ -480,13 +480,13 @@ DlgDocLangCode : "Kalbos kodas", DlgDocCharSet : "Simbolių kodavimo lentelė", -DlgDocCharSetCE : "Central European", //MISSING -DlgDocCharSetCT : "Chinese Traditional (Big5)", //MISSING -DlgDocCharSetCR : "Cyrillic", //MISSING -DlgDocCharSetGR : "Greek", //MISSING -DlgDocCharSetJP : "Japanese", //MISSING -DlgDocCharSetKR : "Korean", //MISSING -DlgDocCharSetTR : "Turkish", //MISSING -DlgDocCharSetUN : "Unicode (UTF-8)", //MISSING -DlgDocCharSetWE : "Western European", //MISSING +DlgDocCharSetCE : "Centrinės Europos", +DlgDocCharSetCT : "Tradicinės kinų (Big5)", +DlgDocCharSetCR : "Kirilica", +DlgDocCharSetGR : "Graikų", +DlgDocCharSetJP : "Japonų", +DlgDocCharSetKR : "Korėjiečių", +DlgDocCharSetTR : "Turkų", +DlgDocCharSetUN : "Unikodas (UTF-8)", +DlgDocCharSetWE : "Vakarų Europos", DlgDocCharSetOther : "Kita simbolių kodavimo lentelė", @@ -518,17 +518,22 @@ DlgTemplatesLoading : "Įkeliamas šablonų sąrašas. Prašome palaukti...", DlgTemplatesNoTpl : "(Šablonų sąrašas tuščias)", -DlgTemplatesReplace : "Replace actual contents", //MISSING +DlgTemplatesReplace : "Pakeisti dabartinį turinį pasirinktu šablonu", // About Dialog DlgAboutAboutTab : "Apie", DlgAboutBrowserInfoTab : "Naršyklės informacija", -DlgAboutLicenseTab : "License", //MISSING +DlgAboutLicenseTab : "Licenzija", DlgAboutVersion : "versija", DlgAboutInfo : "Papildomą informaciją galima gauti", // Div Dialog -DlgDivGeneralTab : "General", //MISSING -DlgDivAdvancedTab : "Advanced", //MISSING -DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivGeneralTab : "Bendros savybės", +DlgDivAdvancedTab : "Papildomos savybės", +DlgDivStyle : "Stilius", +DlgDivInlineStyle : "Stilius kode", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/lv.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/lv.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/lv.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/mn.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/mn.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/mn.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ms.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ms.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ms.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/nb.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/nb.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/nb.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avansert", DlgDivStyle : "Stil", -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/nl.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/nl.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/nl.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Geavanceerd", DlgDivStyle : "Style", -DlgDivInlineStyle : "Inline Style" +DlgDivInlineStyle : "Inline Style", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/no.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/no.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/no.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Avansert", DlgDivStyle : "Stil", -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/pl.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/pl.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/pl.js (revision 4268) @@ -309,5 +309,5 @@ DlgTableCaption : "Tytuł", DlgTableSummary : "Podsumowanie", -DlgTableHeaders : "Headers", //MISSING +DlgTableHeaders : "Nagłówki", DlgTableHeadersNone : "None", //MISSING DlgTableHeadersColumn : "First column", //MISSING @@ -513,5 +513,5 @@ // Templates Dialog -Templates : "Sablony", +Templates : "Szablony", DlgTemplatesTitle : "Szablony zawartości", DlgTemplatesSelMsg : "Wybierz szablon do otwarcia w edytorze
(obecna zawartość okna edytora zostanie utracona):", @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/pt-br.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/pt-br.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/pt-br.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/pt.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/pt.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/pt.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ro.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ro.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ro.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/ru.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/ru.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/ru.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Расширенные настройки", DlgDivStyle : "Стиль", -DlgDivInlineStyle : "Встроенные стили" +DlgDivInlineStyle : "Встроенные стили", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/sk.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/sk.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/sk.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Rozšírené", DlgDivStyle : "Štýl", -DlgDivInlineStyle : "Inline štýl" +DlgDivInlineStyle : "Inline štýl", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/sl.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/sl.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/sl.js (revision 4268) @@ -74,7 +74,7 @@ IncreaseIndent : "Povečaj zamik", Blockquote : "Citat", -CreateDiv : "Create Div Container", //MISSING -EditDiv : "Edit Div Container", //MISSING -DeleteDiv : "Remove Div Container", //MISSING +CreateDiv : "Ustvari Div element", +EditDiv : "Uredi Div element", +DeleteDiv : "Odstrani Div element", Undo : "Razveljavi", Redo : "Ponovi", @@ -162,5 +162,5 @@ BrowseServerBlocked : "Brskalnik virov se ne more odpreti. Prepričajte se, da je preprečevanje pojavnih oken onemogočeno.", DialogBlocked : "Pogovorno okno se ni moglo odpreti. Prepričajte se, da je preprečevanje pojavnih oken onemogočeno.", -VisitLinkBlocked : "It was not possible to open a new window. Make sure all popup blockers are disabled.", //MISSING +VisitLinkBlocked : "Pogovorno okno se ni moglo odpreti. Prepričajte se, da je preprečevanje pojavnih oken onemogočeno.", // Dialogs @@ -309,9 +309,9 @@ DlgTableCaption : "Naslov", DlgTableSummary : "Povzetek", -DlgTableHeaders : "Headers", //MISSING -DlgTableHeadersNone : "None", //MISSING -DlgTableHeadersColumn : "First column", //MISSING -DlgTableHeadersRow : "First Row", //MISSING -DlgTableHeadersBoth : "Both", //MISSING +DlgTableHeaders : "Glava", +DlgTableHeadersNone : "Brez", +DlgTableHeadersColumn : "Prvi stolpec", +DlgTableHeadersRow : "Prva vrstica", +DlgTableHeadersBoth : "Oboje", // Table Cell Dialog @@ -336,7 +336,7 @@ DlgCellVerAlignBottom : "Na dno", DlgCellVerAlignBaseline : "Na osnovno črto", -DlgCellType : "Cell Type", //MISSING -DlgCellTypeData : "Data", //MISSING -DlgCellTypeHeader : "Header", //MISSING +DlgCellType : "Tip celice", +DlgCellTypeData : "Podatek", +DlgCellTypeHeader : "Naslov", DlgCellRowSpan : "Spojenih vrstic (row-span)", DlgCellCollSpan : "Spojenih stolpcev (col-span)", @@ -528,7 +528,12 @@ // Div Dialog -DlgDivGeneralTab : "General", //MISSING -DlgDivAdvancedTab : "Advanced", //MISSING -DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivGeneralTab : "Splošno", +DlgDivAdvancedTab : "Napredno", +DlgDivStyle : "Oblika", +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/sr-latn.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/sr-latn.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/sr-latn.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/sr.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/sr.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/sr.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/sv.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/sv.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/sv.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/th.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/th.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/th.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Advanced", //MISSING DlgDivStyle : "Style", //MISSING -DlgDivInlineStyle : "Inline Style" //MISSING +DlgDivInlineStyle : "Inline Style", //MISSING + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/tr.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/tr.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/tr.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Gelişmiş", DlgDivStyle : "Sitil", -DlgDivInlineStyle : "Satıriçi Sitil" +DlgDivInlineStyle : "Satıriçi Sitil", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/uk.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/uk.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/uk.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Розширена", DlgDivStyle : "Стиль", -DlgDivInlineStyle : "Inline стиль" +DlgDivInlineStyle : "Inline стиль", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/vi.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/vi.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/vi.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "Nâng cao", DlgDivStyle : "Kiểu Style", -DlgDivInlineStyle : "Kiểu Style Trực tiếp" +DlgDivInlineStyle : "Kiểu Style Trực tiếp", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/zh-cn.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/zh-cn.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/zh-cn.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "高级", DlgDivStyle : "样式", -DlgDivInlineStyle : "CSS 样式" +DlgDivInlineStyle : "CSS 样式", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/editor/lang/zh.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/editor/lang/zh.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/editor/lang/zh.js (revision 4268) @@ -531,4 +531,9 @@ DlgDivAdvancedTab : "進階", DlgDivStyle : "樣式", -DlgDivInlineStyle : "CSS 樣式" +DlgDivInlineStyle : "CSS 樣式", + +ScaytTitle : "SCAYT", //MISSING +ScaytTitleOptions : "Options", //MISSING +ScaytTitleLangs : "Languages", //MISSING +ScaytTitleAbout : "About" //MISSING }; Index: /FCKeditor/branches/versions/2.6.x/fckconfig.js =================================================================== --- /FCKeditor/branches/versions/2.6.x/fckconfig.js (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/fckconfig.js (revision 4268) @@ -161,5 +161,5 @@ FCKConfig.TemplatesXmlPath = FCKConfig.EditorPath + 'fcktemplates.xml' ; -FCKConfig.SpellChecker = 'WSC' ; // 'WSC' | 'SpellerPages' | 'ieSpell' +FCKConfig.SpellChecker = 'WSC' ; // 'WSC' | 'SCAYT' | 'SpellerPages' | 'ieSpell' FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/download.php' ; FCKConfig.SpellerPagesServerScript = 'server-scripts/spellchecker.php' ; // Available extension: .php .cfm .pl Index: /FCKeditor/branches/versions/2.6.x/fckpackager.xml =================================================================== --- /FCKeditor/branches/versions/2.6.x/fckpackager.xml (revision 4267) +++ /FCKeditor/branches/versions/2.6.x/fckpackager.xml (revision 4268) @@ -147,4 +147,5 @@ + @@ -243,4 +244,5 @@ +