[geeklog-cvs] geeklog: Updated FCKeditor to version 2.6.4 Final
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Mar 22 22:46:06 EDT 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/9495a2763437
changeset: 6853:9495a2763437
user: blaine Lang <blaine at portalparts.com>
date: Sun Mar 22 22:45:32 2009 -0400
description:
Updated FCKeditor to version 2.6.4 Final
diffstat:
43 files changed, 4167 insertions(+), 2277 deletions(-)
public_html/fckeditor/_documentation.html | 2
public_html/fckeditor/_upgrade.html | 2
public_html/fckeditor/_whatsnew.html | 22
public_html/fckeditor/editor/_source/classes/fckdomrange.js | 4
public_html/fckeditor/editor/_source/fckeditorapi.js | 4
public_html/fckeditor/editor/_source/internals/fckdebug_empty.js | 31
public_html/fckeditor/editor/_source/internals/fcktablehandler.js | 11
public_html/fckeditor/editor/dialog/fck_about.html | 4
public_html/fckeditor/editor/dialog/fck_div.html | 396 ++++
public_html/fckeditor/editor/dtd/fck_dtd_test.html | 82
public_html/fckeditor/editor/fckdebug.html | 306 +--
public_html/fckeditor/editor/fckeditor.html | 634 +++----
public_html/fckeditor/editor/fckeditor.original.html | 848 +++++-----
public_html/fckeditor/editor/filemanager/connectors/php/basexml.php | 186 +-
public_html/fckeditor/editor/filemanager/connectors/php/commands.php | 546 +++---
public_html/fckeditor/editor/filemanager/connectors/php/config.php | 310 +--
public_html/fckeditor/editor/filemanager/connectors/php/connector.php | 174 +-
public_html/fckeditor/editor/filemanager/connectors/php/io.php | 590 +++---
public_html/fckeditor/editor/filemanager/connectors/php/phpcompat.php | 34
public_html/fckeditor/editor/filemanager/connectors/php/upload.php | 125 -
public_html/fckeditor/editor/filemanager/connectors/php/util.php | 440 ++---
public_html/fckeditor/editor/js/fckeditorcode_gecko.js | 6
public_html/fckeditor/editor/js/fckeditorcode_ie.js | 6
public_html/fckeditor/editor/lang/_translationstatus.txt | 10
public_html/fckeditor/editor/lang/fr.js | 16
public_html/fckeditor/editor/lang/gu.js | 534 ++++++
public_html/fckeditor/editor/lang/he.js | 16
public_html/fckeditor/editor/lang/is.js | 534 ++++++
public_html/fckeditor/editor/lang/ru.js | 32
public_html/fckeditor/editor/lang/tr.js | 64
public_html/fckeditor/editor/lang/zh-cn.js | 38
public_html/fckeditor/editor/wsc/ciframe.html | 65
public_html/fckeditor/editor/wsc/tmpFrameset.html | 67
public_html/fckeditor/editor/wsc/w.html | 227 ++
public_html/fckeditor/fckeditor.js | 4
public_html/fckeditor/fckeditor.php | 2
public_html/fckeditor/fckeditor_php4.php | 2
public_html/fckeditor/fckeditor_php5.php | 2
public_html/fckeditor/fckpackager.xml | 4
public_html/fckeditor/fckstyles.xml | 2
public_html/fckeditor/fcktemplates.xml | 2
public_html/fckeditor/license.txt | 2
public_html/fckeditor/myconfig.js | 58
diffs (truncated from 6950 to 300 lines):
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/_documentation.html
--- a/public_html/fckeditor/_documentation.html Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/_documentation.html Sun Mar 22 22:45:32 2009 -0400
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
*
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/_upgrade.html
--- a/public_html/fckeditor/_upgrade.html Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/_upgrade.html Sun Mar 22 22:45:32 2009 -0400
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
* FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2009 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
*
* == BEGIN LICENSE ==
*
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/_whatsnew.html
--- a/public_html/fckeditor/_whatsnew.html Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/_whatsnew.html Sun Mar 22 22:45:32 2009 -0400
@@ -32,6 +32,28 @@
<body>
<h1>
FCKeditor ChangeLog - What's New?</h1>
+ <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>
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/classes/fckdomrange.js
--- a/public_html/fckeditor/editor/_source/classes/fckdomrange.js Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/_source/classes/fckdomrange.js Sun Mar 22 22:45:32 2009 -0400
@@ -469,13 +469,13 @@
// Also note that the node that we use for "address base" would change during backtracking.
var addrStart = this._Range.startContainer ;
var addrEnd = this._Range.endContainer ;
- while ( curStart && addrStart.nodeType == 3 )
+ while ( curStart && curStart.nodeType == 3 && addrStart.nodeType == 3 )
{
bookmark.Start[0] += curStart.length ;
addrStart = curStart ;
curStart = curStart.previousSibling ;
}
- while ( curEnd && addrEnd.nodeType == 3 )
+ while ( curEnd && curEnd.nodeType == 3 && addrEnd.nodeType == 3 )
{
bookmark.End[0] += curEnd.length ;
addrEnd = curEnd ;
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/fckeditorapi.js
--- a/public_html/fckeditor/editor/_source/fckeditorapi.js Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/_source/fckeditorapi.js Sun Mar 22 22:45:32 2009 -0400
@@ -40,8 +40,8 @@
// objects that aren't really FCKeditor instances.
var sScript =
'window.FCKeditorAPI = {' +
- 'Version : "2.6.4 Beta",' +
- 'VersionBuild : "21469",' +
+ 'Version : "2.6.4",' +
+ 'VersionBuild : "21629",' +
'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
'GetInstance : function( name )' +
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/internals/fckdebug_empty.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/fckeditor/editor/_source/internals/fckdebug_empty.js Sun Mar 22 22:45:32 2009 -0400
@@ -0,0 +1,31 @@
+/*
+ * 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 ==
+ *
+ * Debug window control and operations (empty for the compressed files - #2043).
+ */
+
+var FCKDebug =
+{
+ Output : function()
+ {},
+
+ OutputObject : function()
+ {}
+} ;
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/_source/internals/fcktablehandler.js
--- a/public_html/fckeditor/editor/_source/internals/fcktablehandler.js Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/_source/internals/fcktablehandler.js Sun Mar 22 22:45:32 2009 -0400
@@ -287,6 +287,13 @@
var cells = FCKTableHandler.GetSelectedCells() ;
if ( cells.length < 1 )
return false ;
+
+ // Check if the selected cells are all in the same table section (thead, tfoot or tbody)
+ for (var i = 0; i < cells.length; i++)
+ {
+ if ( cells[i].parentNode.parentNode != cells[0].parentNode.parentNode )
+ return false ;
+ }
this._MarkCells( cells, '_CellSelected' ) ;
@@ -839,6 +846,10 @@
if ( ! nextCell )
return null ;
+ // Check if the selected cells are both in the same table section (thead, tfoot or tbody).
+ if ( refCell.parentNode.parentNode != nextCell.parentNode.parentNode )
+ return null ;
+
// The two cells must have the same horizontal geometry, otherwise merging does not makes sense.
this._MarkCells( [refCell, nextCell], '_SizeTest' ) ;
var refGeometry = this._GetMarkerGeometry( tableMap, rowIdx, colIdx, '_SizeTest' ) ;
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/dialog/fck_about.html
--- a/public_html/fckeditor/editor/dialog/fck_about.html Sun Mar 22 21:56:55 2009 +0100
+++ b/public_html/fckeditor/editor/dialog/fck_about.html Sun Mar 22 22:45:32 2009 -0400
@@ -78,8 +78,8 @@
border-left: #000000 1px solid; border-bottom: #000000 1px solid">
<span fcklang="DlgAboutVersion">version</span>
<br />
- <b>2.6.4 Beta</b><br />
- Build 21469</td>
+ <b>2.6.4</b><br />
+ Build 21629</td>
</tr>
</table>
</td>
diff -r fc1a9e2f5449 -r 9495a2763437 public_html/fckeditor/editor/dialog/fck_div.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/public_html/fckeditor/editor/dialog/fck_div.html Sun Mar 22 22:45:32 2009 -0400
@@ -0,0 +1,396 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<!--
+ * 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 ==
+ *
+ * Form dialog window.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta content="noindex, nofollow" name="robots" />
+ <script src="common/fck_dialog_common.js" type="text/javascript"></script>
+ <script type="text/javascript">
+var dialog = window.parent ;
+var oEditor = dialog.InnerDialogLoaded() ;
+var FCK = oEditor.FCK ;
+var FCKLang = oEditor.FCKLang ;
+var FCKBrowserInfo = oEditor.FCKBrowserInfo ;
+var FCKStyles = oEditor.FCKStyles ;
+var FCKElementPath = oEditor.FCKElementPath ;
+var FCKDomRange = oEditor.FCKDomRange ;
+var FCKDomTools = oEditor.FCKDomTools ;
+var FCKDomRangeIterator = oEditor.FCKDomRangeIterator ;
+var FCKListsLib = oEditor.FCKListsLib ;
+var AlwaysCreate = dialog.Args().CustomValue ;
+
+String.prototype.IEquals = function()
+{
+ var thisUpper = this.toUpperCase() ;
+
+ var aArgs = arguments ;
+
+ // The arguments could also be a single array.
+ if ( aArgs.length == 1 && aArgs[0].pop )
+ aArgs = aArgs[0] ;
+
+ for ( var i = 0 ; i < aArgs.length ; i++ )
+ {
+ if ( thisUpper == aArgs[i].toUpperCase() )
+ return true ;
+ }
+ return false ;
+}
+
+var CurrentContainers = [] ;
+if ( !AlwaysCreate )
+{
+ dialog.Selection.EnsureSelection() ;
+ CurrentContainers = FCKDomTools.GetSelectedDivContainers() ;
+}
+
+// Add some tabs
+dialog.AddTab( 'General', FCKLang.DlgDivGeneralTab );
+dialog.AddTab( 'Advanced', FCKLang.DlgDivAdvancedTab ) ;
+
+function AddStyleOption( styleName )
+{
+ var el = GetE( 'selStyle' ) ;
+ var opt = document.createElement( 'option' ) ;
+ opt.text = opt.value = styleName ;
+
+ if ( FCKBrowserInfo.IsIE )
+ el.add( opt ) ;
+ else
+ el.add( opt, null ) ;
+}
+
+function OnDialogTabChange( tabCode )
+{
+ ShowE( 'divGeneral', tabCode == 'General' ) ;
+ ShowE( 'divAdvanced', tabCode == 'Advanced' ) ;
+ dialog.SetAutoSize( true ) ;
+}
+
+function GetNearestAncestorDirection( node )
+{
+ var dir = 'ltr' ; // HTML default.
+ while ( ( node = node.parentNode ) )
+ {
+ if ( node.dir )
+ dir = node.dir ;
+ }
+ return dir ;
+}
+
+window.onload = function()
+{
+ // First of all, translate the dialog box texts
+ oEditor.FCKLanguageManager.TranslatePage(document) ;
+
+ dialog.SetOkButton( true ) ;
+ dialog.SetAutoSize( true ) ;
+
+ // Popuplate the style menu
+ var styles = FCKStyles.GetStyles() ;
+ var selectableStyles = {} ;
+ for ( var i in styles )
+ {
+ if ( ! /^_FCK_/.test( i ) && styles[i].Element == 'div' )
+ selectableStyles[i] = styles[i] ;
+ }
+ if ( CurrentContainers.length <= 1 )
+ {
+ var target = CurrentContainers[0] ;
+ var match = null ;
+ for ( var i in selectableStyles )
+ {
+ if ( target && styles[i].CheckElementRemovable( target, true ) )
+ match = i ;
+ }
+ if ( !match )
+ AddStyleOption( "" ) ;
+ for ( var i in selectableStyles )
More information about the geeklog-cvs
mailing list