Index: /FCKeditor/branches/features/floating_dialog/_dev/build_release.bat
===================================================================
--- /FCKeditor/branches/features/floating_dialog/_dev/build_release.bat	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/_dev/build_release.bat	(revision 1183)
Index: /FCKeditor/branches/features/floating_dialog/_whatsnew.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/_whatsnew.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/_whatsnew.html	(revision 1183)
@@ -22,17 +22,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>FCKeditor ChangeLog - What's New?</title>
+	<title>FCKeditor - What's New?</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<style type="text/css">
 		body { font-family: arial, verdana, sans-serif }
 		p { margin-left: 20px }
-		h1 { border-bottom: solid 1px gray; padding-bottom: 20px }
 	</style>
 </head>
 <body>
-	<h1>
-		FCKeditor ChangeLog - What's New?</h1>
 	<h3>
-		Version 2.5.1 (SVN)</h3>
+		Version 2.6 (SVN)</h3>
 	<p>
 		New Features and Improvements:</p>
@@ -45,4 +42,434 @@
 		<li></li>
 	</ul>
+	<h3>
+		Version 2.5 (SVN)</h3>
+	<p>
+		New Features and Improvements:</p>
+	<ul>
+		<li></li>
+	</ul>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li></li>
+	</ul>
+	<h3>
+		Version 2.5 Beta</h3>
+	<p>
+		New Features and Improvements:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/624">#624</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/634">#634</a>] [<a target="_blank"
+				href="http://dev.fckeditor.net/ticket/1300">#1300</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/1301">#1301</a>]
+			Official compatibility support with <strong>Opera 9.50</strong> and <strong>Safari 3</strong>
+			(WebKit based browsers actually). These browsers are still in Beta, but we are confident
+			that we'll have amazing results as soon as they get stable. We are continuously
+			collaborating with Opera Software and Apple to bring a wonderful FCKeditor experience
+			over their browser platforms.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/494">#494</a>] Introduced
+			the <strong>new Style System</strong>. We are not anymore relaying on browser features
+			to apply and remove styles, which guarantees that the editor will <strong>behave in
+				the same way in all browsers</strong>. It is an incredibly flexible system,
+			which aims to fit all developer's needs, from Flash content or HTML4 to XHTML 1.0
+			Strict or XHTML 1.1:
+			<ul>
+				<li>All basic formatting features, like Bold and Italic, can be precisely controlled
+					by using the configuration file (<b>CoreStyles</b> setting). It means that now,
+					the Bold button, for example, can produce &lt;b&gt;, &lt;strong&gt;, &lt;span class...&gt;,
+					&lt;span style...&gt; or anything the developer prefers.</li>
+				<li>Again with the <b>CoreStyles</b> setting, each block format, font, size, and even
+					the color pickers can precisely reflect end developer's needs.</li>
+				<li>Because of the above changes, font sizes are much more flexible. <b>Any kind of
+					font unit</b> can be used, including a mix of units.</li>
+				<li>All styles, including toolbar bottom styles, are precisely controlled when being
+					applied to the document. FCKeditor uses an element table derived from the <b>W3C XHTML
+						DTDs</b> to precisely create the elements, guarantee standards compliant code.</li>
+				<li><b>No more &lt;font&gt; tags</b>... well... actually, the system is so flexible
+					that it is up to you to use them or not.</li>
+				<li>It is possible to configure FCKeditor to produce a truly <b>semantic aware </b>and<b>
+					XHTML 1.1 compliant </b>code. Check out sample14.html.</li>
+				<li>It's also possible to precisely control which inline elements must be removed with
+					the &quot;Remove All&quot; button, by using the &quot;<b>RemoveFormatTags</b>&quot;
+					setting.</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1231">#1231</a>] [<a
+					target="_blank" href="http://dev.fckeditor.net/ticket/160">#160</a>] Paragraph <b>indentation</b>
+					and <b>justification</b> now uses style attributes and don't create unnecessary
+					elements, and &lt;blockquote&gt; is not anymore used for it. Now, even CSS classes
+					can be used to indent or align text.</li>
+				<li>All paragraph formatting features work well when EnterMode=br.</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/172">#172</a>] All paragraph
+					formatting features work well when list items too.</li>
+			</ul>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1197">#1197</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/132">#132</a>] The toolbar
+			now presents a <strong>new button for Blockquote</strong>. The indentation button
+			will not anymore be used for that.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/125">#125</a>] Table's
+			<strong>columns size can now be changed by dragging on cell borders</strong>, with
+			the "dragresizetable" plugin. </li>
+		<li>The EditorAreaCSS config option can now also be set to a string of paths separated
+			by commas.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/212">#212</a>] New "<strong>Show
+			Blocks</strong>" command button in toolbar to show block details in the editing
+			area. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/915">#915</a>] The <strong>
+			undo/redo system has been revamped</strong> to work the same across Internet Explorer
+			and Gecko-based browsers (e.g. Firefox). A number of critical bugs in the undo/redo
+			system are also fixed. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/194">#194</a>] The editor
+			now uses the <strong>Data Processor</strong> technology, which makes it possible
+			to handle different input formats. A sample of it may be found at "editor/plugins/bbcode/_sample",
+			that shows some simple BBCode support. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/145">#145</a>] The "htaccess.txt"
+			file has been renamed to ".htaccess" as it doesn't bring security concerns, being
+			active out of the box.</li>
+		<li>File Browser and Quick Upload changes:
+			<ul>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/163">#163</a>] <span
+					style="color: #ff0000"><strong>Attention:</strong></span> The default connector
+					in fckconfig.js has been changed from ASP to PHP. If you are using ASP remember
+					to change the _FileBrowserLanguage and _QuickUploadLanguage settings in your fckconfig.js.
+					[<a target="_blank" href="http://dev.fckeditor.net/ticket/454">#454</a>] The file
+					browser and upload connectors have been unified so they can reuse the same configuration
+					settings.</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/865">#865</a>] The ASP
+					and PHP connectors have been improved so it's easy to select the location of the
+					destination folder for each file type, and it's no longer necessary to use the "file",
+					"image", "flash" subfolders<br />
+					<span style="color: #ff0000"><strong>Attention:</strong></span> The location of
+					all the connectors have been changed in the fckconfig.js file. Please check your
+					settings to match the current ones. Also review carefully the config file for your
+					server language. </li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/688">#688</a>] Now the
+					Perl quick upload is available. </li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/575">#575</a>] The Python
+					connector has been rewritten as a WSGI app to be fully compatible with the latest
+					python frameworks and servers. The QuickUpload feature has been added as well as
+					all the features available in the PHP connector. Thanks to Mariano Reingart.</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/561">#561</a>] The ASP
+					connector provides an AbsolutePath setting so it's possible to set the url to a
+					full domain or a relative path and specify that way the physical folder where the
+					files are stored..</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/333">#333</a>] The Quick
+					Upload now can use the same ServerPath parameter as the full connector.</li>
+				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/199">#199</a>] The AllowedCommands
+					configuration setting is available in the asp and php connectors so it's possible
+					to disallow the upload of files (although the "select file" button will still be
+					available in the file browser).</li>
+			</ul>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/100">#100</a>] A new configuration
+			directive "FCKConfig.EditorAreaStyles" has been implemented to allow setting editing
+			area styles from JavaScript. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/102">#102</a>] HTML code
+			generated by the "Paste As Plain Text" feature now obeys the EnterMode setting.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1266">#1266</a>] Introducing
+			the HtmlEncodeOutput setting to instruct the editor to HTML-encode some characters
+			(&amp;, &lt; and &gt;) in the posted data.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/357">#357</a>] Added a
+			"Remove Anchor" option in the context menu for anchors. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1060">#1060</a>] Compatibility
+			checks with Firefox 3.0 Alpha. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/817">#817</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/1077">#1077</a>] New "Merge
+			Down/Right" commands for merging tables cells in non-Gecko browsers.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1288">#1288</a>] The "More
+			Colors..." button in color selector popup has been made optional and configurable
+			by the <strong>EnableMoreFontColors</strong> option. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/356">#356</a>] The <strong>
+			Find and Replace</strong> dialogs are now unified into a single dialog with tabs.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/549">#549</a>] Added a
+			'None' option to the FCKConfig.ToolbarLocation option to allow for hidden toolbars.
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1313">#1313</a>] An XHTML
+			1.1 target editor sample has been created as sample14.html. </li>
+		<li>The ASP, ColdFusion and PHP integration have been aligned to our standards.</li>
+	</ul>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/71">#71</a>] [<a target="_blank"
+			href="http://dev.fckeditor.net/ticket/243">#243</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/267">#267</a>]
+			The editor now takes care to not create invalid nested block elements, like creating
+			&lt;form&gt; or &lt;hr&gt; inside &lt;p&gt;. &nbsp;</li>
+		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1511298&group_id=75348&atid=543655">SF
+			Patch 1511298</a>] The CF Component failed on CFMX 6.0</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/639">#639</a>] If the
+			FCKConfig.DefaultLinkTarget setting was missing in fckconfig.js the links has target="undefined".</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/497">#497</a>] Fixed EMBED
+			attributes handling in IE.</li>
+		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1315722&group_id=75348&atid=543655">SF
+			Patch 1315722</a>] Avoid getting a cached version of the folder contents after uploading
+			a file</li>
+		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1386086&group_id=75348&atid=543655">SF
+			Patch 1386086</a>] The php connector has been protected so mkdir doesn't fail if
+			there are double slashes.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/943">#943</a>] The PHP
+			connector now specifies that the included files are relative to the current path.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/560">#560</a>] The PHP
+			connector will work better if the connector or the userfiles folder is a symlink.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/784">#784</a>] Fixed a
+			non initialized $php_errormsg in the PHP connector.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/802">#802</a>] The replace
+			dialog will now advance its searching position correctly and is able to search for
+			strings spanning across multiple inline tags.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/944">#944</a>] The _samples
+			didn't work directly from the Mac filesystem.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/946">#946</a>] Toolbar
+			images didn't show in non-IE browsers if the path contained a space.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/291">#291</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/395">#395</a>] [<a target="_blank"
+				href="http://dev.fckeditor.net/ticket/932">#932</a>] Clicking outside the editor
+			it was possible to paste or apply formatting to the rest of the page in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/137">#137</a>] Fixed FCKConfig.TabSpaces
+			being ignored, and weird behaviors when pressing tab in edit source mode.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/268">#268</a>] Fixed special
+			XHTML characters present in event attribute values being converted inappropriately
+			when switching to source view.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/272">#272</a>] The toolbar
+			was cut sometimes in IE to just one row if there are multiple instances of the editor.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/515">#515</a>] Tables
+			in Firefox didn't inherit font styles properly in Standards mode.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/321">#321</a>] If FCKeditor
+			is initially hidden in Firefox it will no longer be necessary to call the oEditor.MakeEditable()
+			function.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/299">#299</a>] The 'Browse
+			Server' button in the Image and Flash dialogs was a little too high.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/931">#931</a>] The BodyId
+			and BodyClass configuration settings weren't applied in the preview window.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/583">#583</a>] The "noWrap"
+			attribute for table cells was getting an empty value in Firefox. Thanks to geirhelge.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/141">#141</a>] Fixed incorrect
+			startup focus in Internet Explorer after page reloads. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/143">#143</a>] Fixed browser
+			lockup when the user writes &lt;!--{PS..x}&gt; into the editor in source mode. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/174">#174</a>] Fixed incorrect
+			positioning of FCKeditor in full screen mode. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/978">#978</a>] Fixed a
+			SpellerPages error with ColdFusion when no suggestions where available for a word.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/977">#977</a>] The "shape"
+			attribute of &lt;area&gt; had its value changed to uppercase in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/996">#996</a>] "OnPaste"
+			event listeners will now get executed only once.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/289">#289</a>] Removed
+			debugging popups from page load regarding JavaScript and CSS loading errors.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/328">#328</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/346">#346</a>] [<a target="_blank"
+				href="http://dev.fckeditor.net/ticket/404">#404</a>] Fixed a number of problems
+			regarding &lt;pre&gt; blocks:
+			<ol>
+				<li>Leading whitespaces and line breaks in &lt;pre&gt; blocks are trimmed when the user
+					switches between editor mode and source mode;</li>
+				<li>Pressing Enter inside a &lt;pre&gt; block would split the block into two, but the
+					expected behavior is simply inserting a line break;</li>
+				<li>Simple line breaks inside &lt;pre&gt; blocks entered in source mode are being turned
+					into &lt;br&gt; tags when the user switches to editor mode and back.</li>
+			</ol>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/581">#581</a>] Fixed the
+			issue where the "Maximize the editor size" toolbar button stops working if any of
+			the following occurs:
+			<ol>
+				<li>There exists a form input whose name or id is "style" in FCKeditor's host form;</li>
+				<li>There exists a form input whose name or id is "className" in FCKeditor's host form;</li>
+				<li>There exists a form and a form input whose name of id is "style" in the editing
+					frame.</li>
+			</ol>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/183">#183</a>] Fixed the
+			issue when FCKeditor is being executed in a custom application with the WebBrowser
+			ActiveX control, hiding the WebBrowser control would incorrectly invoke FCKeditor's
+			cleanup routines, causing FCKeditor to stop working.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/539">#539</a>] Fixed the
+			issue where right clicking on a table inside the editing frame in Firefox would
+			cause the editor the scroll to the top of the document.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/523">#523</a>] Fixed the
+			issue where, under certain circumstances, FCKeditor would obtain focus at startup
+			even though FCKConfig.StartupFocus is set to false. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/393">#393</a>] Fixed the
+			issue where if an inline tag is at the end of the document, the user would have
+			no way of escaping from the inline tag if he continues typing at the end of the
+			document. FCKeditor's behaviors regarding inline tags has been made to be more like
+			MS Word's:
+			<ol>
+				<li>If the caret is moved to the end of a hyperlink by the keyboard, then hyperlink
+					mode is disabled. </li>
+				<li>If the caret is moved to the end of other styled inline tags by any key other than
+					the End key (like bold text or italic text), the original bold/italic/... modes
+					would continue to be effective. </li>
+				<li>If the caret is moved to the end of other styled inline tags by the End key, all
+					style tag modes (e.g. bold, italic, underline, etc.) would be canceled. This is
+					not consistent with MS Word, but provides a convenient way for the user to escape
+					the inline tag at the end of a line.</li>
+			</ol>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/338">#338</a>] Fixed the
+			issue where the configuration directive FCKConfig.ForcePasteAsPlainText is ignored
+			when new contents are pasted into the editor via drag-and drop from outside of the
+			editor. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1026">#1026</a>] Fixed
+			the issue where the cursor or selection positions are not restored with undo/redo
+			commands correctly in IE, under some circumstances. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1160">#1160</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/1184">#1184</a>] Home, End
+			and Tab keys are working properly for numeric fields in dialogs. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/68">#68</a>] The style
+			system now properly handles Format styles when EnterMode=br.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/525">#525</a>] The union
+			if successive DIVs will work properly now if EnterMode!=div.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1227">#1227</a>] The color
+			commands used an unnecessary temporary variable. Thanks to Matthias Miller</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/67">#67</a>] [<a target="_blank"
+			href="http://dev.fckeditor.net/ticket/277">#277</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/427">#427</a>]
+			[<a target="_blank" href="http://dev.fckeditor.net/ticket/428">#428</a>] [<a target="_blank"
+				href="http://dev.fckeditor.net/ticket/965">#965</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/1178">#1178</a>]
+			[<a target="_blank" href="http://dev.fckeditor.net/ticket/1267">#1267</a>] The list
+			insertion/removal/indent/outdent logic in FCKeditor has been rewritten, such that:
+			<ol>
+				<li>Text separated by &lt;br&gt; will always be treated as separate items during list
+					insertion regardless of browser;</li>
+				<li>List removal will now always obey the FCKConfig.EnterMode setting;</li>
+				<li>List indentation will be XHTML 1.1 compliant - all child elements under an &lt;ol&gt;
+					or &lt;ul&gt; must be &lt;li&gt; nodes;</li>
+				<li>IE editor hacks like &lt;ul type=&quot;1&quot;&gt; will no longer appear;</li>
+				<li>Excessive &lt;div&gt; nodes are no longer inserted into list items due to alignment
+					changes.</li>
+			</ol>
+		</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/205">#205</a>] Fixed the
+			issue where visible &gt;br&lt; tags at the end of paragraphs are incorrectly removed
+			after switching to and from source mode.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1050">#1050</a>] Fixed
+			a minor PHP/XML incompatibility bug in editor/dialog/fck_docprops.html.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/462">#462</a>] Fixed an
+			algorithm bug in switching from source mode to WYSIWYG mode which causes the browser
+			to spin up and freeze for broken HTML code inputs.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1019">#1019</a>] Table
+			command buttons are now disabled when the current selection is not inside a table.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/135">#135</a>] Fixed the
+			issue where context menus are misplaced in FCKeditor when FCKeditor is created inside
+			a &gt;div&lt; node with scrolling. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1067">#1067</a>] Fixed
+			the issue where context menus are misplaced in Safari when FCKeditor is scrolled
+			down.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1081">#1081</a>] Fixed
+			the issue where undoing table deletion in IE7 would cause JavaScript errors.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1061">#1061</a>] Fixed
+			the issue where backspace and delete cannot delete special characters in Firefox
+			under some circumstances.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/403">#403</a>] Fixed the
+			issue where switching to and from source mode in full page mode under IE would add
+			excessive line breaks to &lt;style&gt; blocks.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/121">#121</a>] Fixed the
+			issue where maximizing FCKeditor inside a frameset would resize FCKeditor to the
+			whole window's size instead of just the container frame's size.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1093">#1093</a>] Fixed
+			the issue where pressing Enter inside an inline tag would not create a new paragraph
+			correctly.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1089">#1089</a>] Fixed
+			the issue where pressing Enter inside a &lt;pre&gt; block do not generate visible
+			line breaks in IE.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/332">#332</a>] Hitting
+			Enter when the caret is at the end of a hyperlink will no longer continue the link
+			at the new paragraph.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1121">#1121</a>] Hitting
+			Enter with FCKConfig.EnterMode=br will now scroll the document correctly when the
+			new lines have exceeded the lower boundary of the editor frame.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1063">#1063</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/1084">#1084</a>] [<a target="_blank"
+				href="http://dev.fckeditor.net/ticket/1092">#1092</a>] Fixed a few Norwegian
+			language translation errors.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1148">#1148</a>] Fixed
+			the issue where the &quot;Automatic&quot; and &quot;More Colors...&quot; buttons
+			in the color selection panel are not centered in Safari.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1187">#1187</a>] Fixed
+			the issue where the &quot;Paste as plain text&quot; command cannot be undone in
+			non-IE browsers.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1222">#1222</a>] Ctrl-Backspace
+			operations will now save undo snapshots in all browsers.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1223">#1223</a>] Fixed
+			the issue where the insert link dialog would save multiple undo snapshots for a
+			single operation.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/247">#247</a>] Fixed the
+			issue where deleting everything in the document in IE would create an empty &lt;p&gt;
+			block in the document regardless of EnterMode setting. </li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1280">#1280</a>] Fixed
+			the issue where opening a combo box will cause the editor frames to lose focus when
+			there are multiple editors in the same document.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/363">#363</a>] Fixed the
+			issue where the Find dialog does not work under Opera.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/50">#50</a>] Fixed the
+			issue where the Paste button is always disabled in Safari.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/389">#389</a>] Pasting
+			text with comments from Word won't generate errors in IE, thanks to the idea from
+			Swift.</li>
+		<li>The pasting area in the Paste from Word dialog is focused on initial load</li>
+		<li>Some fixes related to html comment handling in the Word clean up routine</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1303">#1303</a>] &lt;col&gt;
+			is correctly treated as an empty element.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/969">#969</a>] Removed
+			unused files (fcknumericfield.htc and moz-bindings.xml).</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1166">#1166</a>] Fixed
+			the issue where &lt;meta&gt; tags are incorrectly outputted with closing tags in
+			full page mode.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1200">#1200</a>] Fixed
+			the issue where context menus sometimes disappear prematurely before the user can
+			click on any items in Opera.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1315">#1315</a>] Fixed
+			the issue where the source view text area in Safari is displayed with an excessive
+			blue border.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1201">#1201</a>] Fixed
+			the issue where hitting Backspace or Delete inside a table cell deletes the table
+			cell instead of its contents in Opera.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1311">#1311</a>] Fixed
+			the issue where undoing and redoing a special character insertion would send the
+			caret to incorrect positions. (e.g. the beginning of document)</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/923">#923</a>] Font colors
+			are now properly applied on links.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1316">#1316</a>] Fixed
+			the issue where the image dialog expands to a size too big in Safari.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1306">#1306</a>] [<a
+			target="_blank" href="http://dev.fckeditor.net/ticket/894">#894</a>] The undo system
+			can now undo text formatting steps like setting fonts to bold and italic.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/95">#95</a>] Fixed the
+			issue where FCKeditor breaks &lt;meta&gt; tags in full page mode in some circumstances.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/175">#175</a>] Fixed the
+			issue where entering an email address with a '%' sign in the insert link dialog
+			would cause JavaScript error.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/180">#180</a>] Improved
+			backward compatibility with older PHP versions. FCKeditor can now work with PHP
+			versions down to 4.0.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/192">#192</a>] Document
+			modifying actions from the FCKeditor JavaScript API will now save undo steps.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/246">#246</a>] Using text
+			formatting commands in EnterMode=div will no longer cause tags to randomly disappear.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/327">#327</a>] It is no
+			longer possible for the browser's back action to misfire when a user presses backspace
+			while an image is being selected in FCKeditor.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/362">#362</a>] Ctrl-Backspace
+			now works in FCKeditor.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/390">#390</a>] Text alignment
+			and justification commands now respects EnterMode=br paragraph rules.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/534">#534</a>] Pressing
+			Ctrl-End while the document contains a list towards the end will no longer make
+			the cursor disappear.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/906">#906</a>] It is now
+			possible to have XHTML 1.0 Strict compliant output from a document pasted from Word.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/929">#929</a>] Pressing
+			the Enter key will now produce an undo step.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/934">#934</a>] Fixed the
+			"Cannot execute code from a freed script" error in IE from editor dialogs.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/942">#942</a>] Server
+			based spell checking with ColdFusion integration no longer breaks fir non en_US
+			languages.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/942">#1056</a>] Deleting
+			everything in the editor document and moving the cursor around will no longer leave
+			the cursor hanging beyond the top of the editor document.</li>
+	</ul>
+	<p>
+		# This version has been <a href="http://dev.fckeditor.net/wiki/SD/COE">partially sponsored</a>
+		by the <a href="http://www.coe.int/">Council of Europe</a>.
+	</p>
 	<p>
 		<a href="_whatsnew_history.html">See previous versions history</a>
Index: /FCKeditor/branches/features/floating_dialog/_whatsnew_history.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/_whatsnew_history.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/_whatsnew_history.html	(revision 1183)
@@ -22,547 +22,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>FCKeditor ChangeLog - What's New?</title>
+	<title>FCKeditor - What's New?</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<style type="text/css">
 		body { font-family: arial, verdana, sans-serif }
 		p { margin-left: 20px }
-		h1 { border-bottom: solid 1px gray; padding-bottom: 20px }
 	</style>
 </head>
 <body>
-	<h1>
-		FCKeditor ChangeLog - What's New?</h1>
-	<h3>
-		Version 2.5</h3>
-	<p>
-		New Features and Improvements:</p>
-	<ul>
-		<li>The heading options have been moved to the top, in the default settings for the
-			Format combo.</li>
-	</ul>
-	<p>
-		Fixed Bugs:</p>
-	<ul>
-		<li>The focus is now correctly set when working on Safari.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1436">#1436</a>] Nested
-			context menu panels are now correctly closed on Safari.</li>
-		<li>Empty anchors are now properly created on Safari.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1359">#1359</a>] FCKeditor
-			will no longer produce the strange visual effect of creating a selected space and
-			then deleting it in Internet Explorer.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1399">#1399</a>] Removed
-			the empty entry in the language selection box of sample03.html.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1400">#1400</a>] Fixed
-			the issue where the style selection box in sample14.html is not context sensitive.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1401">#1401</a>] Completed
-			Hebrew translation of the user interface.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1409">#1409</a>] Completed
-			Finnish translation of the user interface.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1414">#1414</a>] Fixed
-			the issue where entity code words written inside a &lt;pre&gt; block in Source mode
-			are not converted to the corresponding characters after switching back to editor
-			mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1418">#1418</a>] Fixed
-			the issue where a detached toolbar would flicker when FCKeditor is being loaded.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1419">#1419</a>] Fixed
-			the issue where pressing Delete in the middle of two lists would incorrectly move
-			contents after the lists to the character position.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1420">#1420</a>] Fixed
-			the issue where empty list items can become collapsed and uneditable when it has
-			one of more indented list items directly under it. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1431">#1431</a>] Fixed
-			the issue where pressing Enter in a &lt;pre&gt; block in Internet Explorer would
-			move the caret one space forward instead of sending it to the next line.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1472">#1472</a>] Completed
-			Arabic translation of the user interface.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1474">#1474</a>] Fixed
-			the issue where reloading a page containing FCKeditor may provoke JavaScript errors
-			in Internet Explorer.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1478">#1478</a>] Fixed
-			the issue where parsing fckstyles.xml fails if the file contains no &lt;style&gt;
-			nodes.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1491">#1491</a>] Fixed
-			the issue where FCKeditor causes the selection to include an "end of line" character
-			in list items even though the list item is empty.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1496">#1496</a>] Fixed
-			the issue where attributes under &lt;area&gt; and &lt;map&gt; nodes are destroyed
-			or left unprotected when switching to and from Source mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1500">#1500</a>] Fixed
-			the issue where the function _FCK_PaddingNodeListener() is called excessively which
-			negatively affects performance.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1514">#1514</a>] Fixed
-			the issue where floating menus are incorrectly positioned when the toolbar or the
-			editor frame are not static positioned.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1518">#1518</a>] Fixed
-			the issue where excessive &lt;BR&gt; nodes are not removed after a paragraph is
-			split when creating lists.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1521">#1521</a>] Fixed
-			JavaScript error and erratic behavior of the Replace dialog.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1524">#1524</a>] Fixed
-			the issue where the caret jumps to the beginning or end of a list block and when
-			user is trying to select the end of a list item.</li>
-		<li>Completed Simplified Chinese translation of the user interface.</li>
-		<li>Completed Estonian translation of the user interface.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1406">#1406</a>] Editor
-			was always "dirty" if flash is available in the contents.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1561">#1561</a>] Non standard
-			elements are now properly applied if defined in the styles XML file.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1412">#1412</a>] The _QuickUploadLanguage
-			value is now work properly for Perl.</li>
-		<li>Several compatibility fixes for Firefox 3 (Beta 1):
-			<ul>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1558">#1558</a>] Nested
-					context menu close properly when one of their options is selected.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1556">#1556</a>] Dialogs
-					contents are now showing completely, without scrollbar.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1559">#1559</a>] It is
-					not possible to have more than one panel opened at the same time.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1554">#1554</a>] Links
-					now get underlined.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1557">#1557</a>] The "Automatic"
-					and "More colors..." buttons were improperly styled in the color selector panels
-					(Opera too).</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1462">#1462</a>] The enter
-					key will not any more scroll the main window.</li>
-			</ul>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1562">#1562</a>] Fixed
-			the issue where empty paragraphs are added around page breaks each time the user
-			switches to Source mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1578">#1578</a>] The editor
-			will now scroll correctly when hitting enter in front of a paragraph.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1579">#1579</a>] Fixed
-			the issue where the create table and table properties dialogs are too narrow for
-			certain translations.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1580">#1580</a>] Completed
-			Polish translation of the user interface.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1591">#1591</a>] Fixed
-			JavaScript error when using the blockquote command in an empty document in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1592">#1592</a>] Fixed
-			the issue where attempting to remove a blockquote with an empty paragraph would
-			leave behind an empty blockquote IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1594">#1594</a>] Undo/Redo
-			will now work properly for the color selectors.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1597">#1597</a>] The color
-			boxes are now properly rendered in the color selector panels on sample14.html.</li>
-	</ul>
-	<h3>
-		Version 2.5 Beta</h3>
-	<p>
-		New Features and Improvements:</p>
-	<ul>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/624">#624</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/634">#634</a>] [<a target="_blank"
-				href="http://dev.fckeditor.net/ticket/1300">#1300</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/1301">#1301</a>]
-			Official compatibility support with <strong>Opera 9.50</strong> and <strong>Safari 3</strong>
-			(WebKit based browsers actually). These browsers are still in Beta, but we are confident
-			that we'll have amazing results as soon as they get stable. We are continuously
-			collaborating with Opera Software and Apple to bring a wonderful FCKeditor experience
-			over their browser platforms.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/494">#494</a>] Introduced
-			the <strong>new Style System</strong>. We are not anymore relaying on browser features
-			to apply and remove styles, which guarantees that the editor will <strong>behave in
-				the same way in all browsers</strong>. It is an incredibly flexible system,
-			which aims to fit all developer's needs, from Flash content or HTML4 to XHTML 1.0
-			Strict or XHTML 1.1:
-			<ul>
-				<li>All basic formatting features, like Bold and Italic, can be precisely controlled
-					by using the configuration file (<b>CoreStyles</b> setting). It means that now,
-					the Bold button, for example, can produce &lt;b&gt;, &lt;strong&gt;, &lt;span class...&gt;,
-					&lt;span style...&gt; or anything the developer prefers.</li>
-				<li>Again with the <b>CoreStyles</b> setting, each block format, font, size, and even
-					the color pickers can precisely reflect end developer's needs.</li>
-				<li>Because of the above changes, font sizes are much more flexible. <b>Any kind of
-					font unit</b> can be used, including a mix of units.</li>
-				<li>All styles, including toolbar bottom styles, are precisely controlled when being
-					applied to the document. FCKeditor uses an element table derived from the <b>W3C XHTML
-						DTDs</b> to precisely create the elements, guarantee standards compliant code.</li>
-				<li><b>No more &lt;font&gt; tags</b>... well... actually, the system is so flexible
-					that it is up to you to use them or not.</li>
-				<li>It is possible to configure FCKeditor to produce a truly <b>semantic aware </b>and<b>
-					XHTML 1.1 compliant </b>code. Check out sample14.html.</li>
-				<li>It's also possible to precisely control which inline elements must be removed with
-					the &quot;Remove All&quot; button, by using the &quot;<b>RemoveFormatTags</b>&quot;
-					setting.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1231">#1231</a>] [<a
-					target="_blank" href="http://dev.fckeditor.net/ticket/160">#160</a>] Paragraph <b>indentation</b>
-					and <b>justification</b> now uses style attributes and don't create unnecessary
-					elements, and &lt;blockquote&gt; is not anymore used for it. Now, even CSS classes
-					can be used to indent or align text.</li>
-				<li>All paragraph formatting features work well when EnterMode=br.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/172">#172</a>] All paragraph
-					formatting features work well when list items too.</li>
-			</ul>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1197">#1197</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/132">#132</a>] The toolbar
-			now presents a <strong>new button for Blockquote</strong>. The indentation button
-			will not anymore be used for that.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/125">#125</a>] Table's
-			<strong>columns size can now be changed by dragging on cell borders</strong>, with
-			the "dragresizetable" plugin. </li>
-		<li>The EditorAreaCSS config option can now also be set to a string of paths separated
-			by commas.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/212">#212</a>] New "<strong>Show
-			Blocks</strong>" command button in toolbar to show block details in the editing
-			area. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/915">#915</a>] The <strong>
-			undo/redo system has been revamped</strong> to work the same across Internet Explorer
-			and Gecko-based browsers (e.g. Firefox). A number of critical bugs in the undo/redo
-			system are also fixed. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/194">#194</a>] The editor
-			now uses the <strong>Data Processor</strong> technology, which makes it possible
-			to handle different input formats. A sample of it may be found at "editor/plugins/bbcode/_sample",
-			that shows some simple BBCode support. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/145">#145</a>] The "htaccess.txt"
-			file has been renamed to ".htaccess" as it doesn't bring security concerns, being
-			active out of the box.</li>
-		<li>File Browser and Quick Upload changes:
-			<ul>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/163">#163</a>] <span
-					style="color: #ff0000"><strong>Attention:</strong></span> The default connector
-					in fckconfig.js has been changed from ASP to PHP. If you are using ASP remember
-					to change the _FileBrowserLanguage and _QuickUploadLanguage settings in your fckconfig.js.
-					[<a target="_blank" href="http://dev.fckeditor.net/ticket/454">#454</a>] The file
-					browser and upload connectors have been unified so they can reuse the same configuration
-					settings.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/865">#865</a>] The ASP
-					and PHP connectors have been improved so it's easy to select the location of the
-					destination folder for each file type, and it's no longer necessary to use the "file",
-					"image", "flash" subfolders<br />
-					<span style="color: #ff0000"><strong>Attention:</strong></span> The location of
-					all the connectors have been changed in the fckconfig.js file. Please check your
-					settings to match the current ones. Also review carefully the config file for your
-					server language. </li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/688">#688</a>] Now the
-					Perl quick upload is available. </li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/575">#575</a>] The Python
-					connector has been rewritten as a WSGI app to be fully compatible with the latest
-					python frameworks and servers. The QuickUpload feature has been added as well as
-					all the features available in the PHP connector. Thanks to Mariano Reingart.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/561">#561</a>] The ASP
-					connector provides an AbsolutePath setting so it's possible to set the url to a
-					full domain or a relative path and specify that way the physical folder where the
-					files are stored..</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/333">#333</a>] The Quick
-					Upload now can use the same ServerPath parameter as the full connector.</li>
-				<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/199">#199</a>] The AllowedCommands
-					configuration setting is available in the asp and php connectors so it's possible
-					to disallow the upload of files (although the "select file" button will still be
-					available in the file browser).</li>
-			</ul>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/100">#100</a>] A new configuration
-			directive "FCKConfig.EditorAreaStyles" has been implemented to allow setting editing
-			area styles from JavaScript. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/102">#102</a>] HTML code
-			generated by the "Paste As Plain Text" feature now obeys the EnterMode setting.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1266">#1266</a>] Introducing
-			the HtmlEncodeOutput setting to instruct the editor to HTML-encode some characters
-			(&amp;, &lt; and &gt;) in the posted data.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/357">#357</a>] Added a
-			"Remove Anchor" option in the context menu for anchors. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1060">#1060</a>] Compatibility
-			checks with Firefox 3.0 Alpha. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/817">#817</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/1077">#1077</a>] New "Merge
-			Down/Right" commands for merging tables cells in non-Gecko browsers.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1288">#1288</a>] The "More
-			Colors..." button in color selector popup has been made optional and configurable
-			by the <strong>EnableMoreFontColors</strong> option. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/356">#356</a>] The <strong>
-			Find and Replace</strong> dialogs are now unified into a single dialog with tabs.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/549">#549</a>] Added a
-			'None' option to the FCKConfig.ToolbarLocation option to allow for hidden toolbars.
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1313">#1313</a>] An XHTML
-			1.1 target editor sample has been created as sample14.html. </li>
-		<li>The ASP, ColdFusion and PHP integration have been aligned to our standards.</li>
-	</ul>
-	<p>
-		Fixed Bugs:</p>
-	<ul>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/71">#71</a>] [<a target="_blank"
-			href="http://dev.fckeditor.net/ticket/243">#243</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/267">#267</a>]
-			The editor now takes care to not create invalid nested block elements, like creating
-			&lt;form&gt; or &lt;hr&gt; inside &lt;p&gt;. &nbsp;</li>
-		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1511298&group_id=75348&atid=543655">SF
-			Patch 1511298</a>] The CF Component failed on CFMX 6.0</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/639">#639</a>] If the
-			FCKConfig.DefaultLinkTarget setting was missing in fckconfig.js the links has target="undefined".</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/497">#497</a>] Fixed EMBED
-			attributes handling in IE.</li>
-		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1315722&group_id=75348&atid=543655">SF
-			Patch 1315722</a>] Avoid getting a cached version of the folder contents after uploading
-			a file</li>
-		<li>[<a target="_blank" href="https://sourceforge.net/tracker/?func=detail&aid=1386086&group_id=75348&atid=543655">SF
-			Patch 1386086</a>] The php connector has been protected so mkdir doesn't fail if
-			there are double slashes.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/943">#943</a>] The PHP
-			connector now specifies that the included files are relative to the current path.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/560">#560</a>] The PHP
-			connector will work better if the connector or the userfiles folder is a symlink.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/784">#784</a>] Fixed a
-			non initialized $php_errormsg in the PHP connector.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/802">#802</a>] The replace
-			dialog will now advance its searching position correctly and is able to search for
-			strings spanning across multiple inline tags.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/944">#944</a>] The _samples
-			didn't work directly from the Mac filesystem.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/946">#946</a>] Toolbar
-			images didn't show in non-IE browsers if the path contained a space.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/291">#291</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/395">#395</a>] [<a target="_blank"
-				href="http://dev.fckeditor.net/ticket/932">#932</a>] Clicking outside the editor
-			it was possible to paste or apply formatting to the rest of the page in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/137">#137</a>] Fixed FCKConfig.TabSpaces
-			being ignored, and weird behaviors when pressing tab in edit source mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/268">#268</a>] Fixed special
-			XHTML characters present in event attribute values being converted inappropriately
-			when switching to source view.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/272">#272</a>] The toolbar
-			was cut sometimes in IE to just one row if there are multiple instances of the editor.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/515">#515</a>] Tables
-			in Firefox didn't inherit font styles properly in Standards mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/321">#321</a>] If FCKeditor
-			is initially hidden in Firefox it will no longer be necessary to call the oEditor.MakeEditable()
-			function.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/299">#299</a>] The 'Browse
-			Server' button in the Image and Flash dialogs was a little too high.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/931">#931</a>] The BodyId
-			and BodyClass configuration settings weren't applied in the preview window.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/583">#583</a>] The "noWrap"
-			attribute for table cells was getting an empty value in Firefox. Thanks to geirhelge.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/141">#141</a>] Fixed incorrect
-			startup focus in Internet Explorer after page reloads. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/143">#143</a>] Fixed browser
-			lockup when the user writes &lt;!--{PS..x}&gt; into the editor in source mode. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/174">#174</a>] Fixed incorrect
-			positioning of FCKeditor in full screen mode. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/978">#978</a>] Fixed a
-			SpellerPages error with ColdFusion when no suggestions where available for a word.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/977">#977</a>] The "shape"
-			attribute of &lt;area&gt; had its value changed to uppercase in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/996">#996</a>] "OnPaste"
-			event listeners will now get executed only once.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/289">#289</a>] Removed
-			debugging popups from page load regarding JavaScript and CSS loading errors.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/328">#328</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/346">#346</a>] [<a target="_blank"
-				href="http://dev.fckeditor.net/ticket/404">#404</a>] Fixed a number of problems
-			regarding &lt;pre&gt; blocks:
-			<ol>
-				<li>Leading whitespaces and line breaks in &lt;pre&gt; blocks are trimmed when the user
-					switches between editor mode and source mode;</li>
-				<li>Pressing Enter inside a &lt;pre&gt; block would split the block into two, but the
-					expected behavior is simply inserting a line break;</li>
-				<li>Simple line breaks inside &lt;pre&gt; blocks entered in source mode are being turned
-					into &lt;br&gt; tags when the user switches to editor mode and back.</li>
-			</ol>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/581">#581</a>] Fixed the
-			issue where the "Maximize the editor size" toolbar button stops working if any of
-			the following occurs:
-			<ol>
-				<li>There exists a form input whose name or id is "style" in FCKeditor's host form;</li>
-				<li>There exists a form input whose name or id is "className" in FCKeditor's host form;</li>
-				<li>There exists a form and a form input whose name of id is "style" in the editing
-					frame.</li>
-			</ol>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/183">#183</a>] Fixed the
-			issue when FCKeditor is being executed in a custom application with the WebBrowser
-			ActiveX control, hiding the WebBrowser control would incorrectly invoke FCKeditor's
-			cleanup routines, causing FCKeditor to stop working.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/539">#539</a>] Fixed the
-			issue where right clicking on a table inside the editing frame in Firefox would
-			cause the editor the scroll to the top of the document.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/523">#523</a>] Fixed the
-			issue where, under certain circumstances, FCKeditor would obtain focus at startup
-			even though FCKConfig.StartupFocus is set to false. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/393">#393</a>] Fixed the
-			issue where if an inline tag is at the end of the document, the user would have
-			no way of escaping from the inline tag if he continues typing at the end of the
-			document. FCKeditor's behaviors regarding inline tags has been made to be more like
-			MS Word's:
-			<ol>
-				<li>If the caret is moved to the end of a hyperlink by the keyboard, then hyperlink
-					mode is disabled. </li>
-				<li>If the caret is moved to the end of other styled inline tags by any key other than
-					the End key (like bold text or italic text), the original bold/italic/... modes
-					would continue to be effective. </li>
-				<li>If the caret is moved to the end of other styled inline tags by the End key, all
-					style tag modes (e.g. bold, italic, underline, etc.) would be canceled. This is
-					not consistent with MS Word, but provides a convenient way for the user to escape
-					the inline tag at the end of a line.</li>
-			</ol>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/338">#338</a>] Fixed the
-			issue where the configuration directive FCKConfig.ForcePasteAsPlainText is ignored
-			when new contents are pasted into the editor via drag-and drop from outside of the
-			editor. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1026">#1026</a>] Fixed
-			the issue where the cursor or selection positions are not restored with undo/redo
-			commands correctly in IE, under some circumstances. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1160">#1160</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/1184">#1184</a>] Home, End
-			and Tab keys are working properly for numeric fields in dialogs. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/68">#68</a>] The style
-			system now properly handles Format styles when EnterMode=br.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/525">#525</a>] The union
-			of successive DIVs will work properly now if EnterMode!=div.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1227">#1227</a>] The color
-			commands used an unnecessary temporary variable. Thanks to Matthias Miller</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/67">#67</a>] [<a target="_blank"
-			href="http://dev.fckeditor.net/ticket/277">#277</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/427">#427</a>]
-			[<a target="_blank" href="http://dev.fckeditor.net/ticket/428">#428</a>] [<a target="_blank"
-				href="http://dev.fckeditor.net/ticket/965">#965</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/1178">#1178</a>]
-			[<a target="_blank" href="http://dev.fckeditor.net/ticket/1267">#1267</a>] The list
-			insertion/removal/indent/outdent logic in FCKeditor has been rewritten, such that:
-			<ol>
-				<li>Text separated by &lt;br&gt; will always be treated as separate items during list
-					insertion regardless of browser;</li>
-				<li>List removal will now always obey the FCKConfig.EnterMode setting;</li>
-				<li>List indentation will be XHTML 1.1 compliant - all child elements under an &lt;ol&gt;
-					or &lt;ul&gt; must be &lt;li&gt; nodes;</li>
-				<li>IE editor hacks like &lt;ul type=&quot;1&quot;&gt; will no longer appear;</li>
-				<li>Excessive &lt;div&gt; nodes are no longer inserted into list items due to alignment
-					changes.</li>
-			</ol>
-		</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/205">#205</a>] Fixed the
-			issue where visible &lt;br&gt; tags at the end of paragraphs are incorrectly removed
-			after switching to and from source mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1050">#1050</a>] Fixed
-			a minor PHP/XML incompatibility bug in editor/dialog/fck_docprops.html.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/462">#462</a>] Fixed an
-			algorithm bug in switching from source mode to WYSIWYG mode which causes the browser
-			to spin up and freeze for broken HTML code inputs.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1019">#1019</a>] Table
-			command buttons are now disabled when the current selection is not inside a table.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/135">#135</a>] Fixed the
-			issue where context menus are misplaced in FCKeditor when FCKeditor is created inside
-			a &lt;div&gt; node with scrolling. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1067">#1067</a>] Fixed
-			the issue where context menus are misplaced in Safari when FCKeditor is scrolled
-			down.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1081">#1081</a>] Fixed
-			the issue where undoing table deletion in IE7 would cause JavaScript errors.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1061">#1061</a>] Fixed
-			the issue where backspace and delete cannot delete special characters in Firefox
-			under some circumstances.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/403">#403</a>] Fixed the
-			issue where switching to and from source mode in full page mode under IE would add
-			excessive line breaks to &lt;style&gt; blocks.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/121">#121</a>] Fixed the
-			issue where maximizing FCKeditor inside a frameset would resize FCKeditor to the
-			whole window's size instead of just the container frame's size.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1093">#1093</a>] Fixed
-			the issue where pressing Enter inside an inline tag would not create a new paragraph
-			correctly.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1089">#1089</a>] Fixed
-			the issue where pressing Enter inside a &lt;pre&gt; block do not generate visible
-			line breaks in IE.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/332">#332</a>] Hitting
-			Enter when the caret is at the end of a hyperlink will no longer continue the link
-			at the new paragraph.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1121">#1121</a>] Hitting
-			Enter with FCKConfig.EnterMode=br will now scroll the document correctly when the
-			new lines have exceeded the lower boundary of the editor frame.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1063">#1063</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/1084">#1084</a>] [<a target="_blank"
-				href="http://dev.fckeditor.net/ticket/1092">#1092</a>] Fixed a few Norwegian
-			language translation errors.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1148">#1148</a>] Fixed
-			the issue where the &quot;Automatic&quot; and &quot;More Colors...&quot; buttons
-			in the color selection panel are not centered in Safari.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1187">#1187</a>] Fixed
-			the issue where the &quot;Paste as plain text&quot; command cannot be undone in
-			non-IE browsers.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1222">#1222</a>] Ctrl-Backspace
-			operations will now save undo snapshots in all browsers.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1223">#1223</a>] Fixed
-			the issue where the insert link dialog would save multiple undo snapshots for a
-			single operation.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/247">#247</a>] Fixed the
-			issue where deleting everything in the document in IE would create an empty &lt;p&gt;
-			block in the document regardless of EnterMode setting. </li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1280">#1280</a>] Fixed
-			the issue where opening a combo box will cause the editor frames to lose focus when
-			there are multiple editors in the same document.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/363">#363</a>] Fixed the
-			issue where the Find dialog does not work under Opera.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/50">#50</a>] Fixed the
-			issue where the Paste button is always disabled in Safari.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/389">#389</a>] Pasting
-			text with comments from Word won't generate errors in IE, thanks to the idea from
-			Swift.</li>
-		<li>The pasting area in the Paste from Word dialog is focused on initial load</li>
-		<li>Some fixes related to html comment handling in the Word clean up routine</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1303">#1303</a>] &lt;col&gt;
-			is correctly treated as an empty element.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/969">#969</a>] Removed
-			unused files (fcknumericfield.htc and moz-bindings.xml).</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1166">#1166</a>] Fixed
-			the issue where &lt;meta&gt; tags are incorrectly outputted with closing tags in
-			full page mode.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1200">#1200</a>] Fixed
-			the issue where context menus sometimes disappear prematurely before the user can
-			click on any items in Opera.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1315">#1315</a>] Fixed
-			the issue where the source view text area in Safari is displayed with an excessive
-			blue border.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1201">#1201</a>] Fixed
-			the issue where hitting Backspace or Delete inside a table cell deletes the table
-			cell instead of its contents in Opera.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1311">#1311</a>] Fixed
-			the issue where undoing and redoing a special character insertion would send the
-			caret to incorrect positions. (e.g. the beginning of document)</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/923">#923</a>] Font colors
-			are now properly applied on links.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1316">#1316</a>] Fixed
-			the issue where the image dialog expands to a size too big in Safari.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1306">#1306</a>] [<a
-			target="_blank" href="http://dev.fckeditor.net/ticket/894">#894</a>] The undo system
-			can now undo text formatting steps like setting fonts to bold and italic.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/95">#95</a>] Fixed the
-			issue where FCKeditor breaks &lt;meta&gt; tags in full page mode in some circumstances.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/175">#175</a>] Fixed the
-			issue where entering an email address with a '%' sign in the insert link dialog
-			would cause JavaScript error.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/180">#180</a>] Improved
-			backward compatibility with older PHP versions. FCKeditor can now work with PHP
-			versions down to 4.0.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/192">#192</a>] Document
-			modifying actions from the FCKeditor JavaScript API will now save undo steps.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/246">#246</a>] Using text
-			formatting commands in EnterMode=div will no longer cause tags to randomly disappear.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/327">#327</a>] It is no
-			longer possible for the browser's back action to misfire when a user presses backspace
-			while an image is being selected in FCKeditor.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/362">#362</a>] Ctrl-Backspace
-			now works in FCKeditor.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/390">#390</a>] Text alignment
-			and justification commands now respects EnterMode=br paragraph rules.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/534">#534</a>] Pressing
-			Ctrl-End while the document contains a list towards the end will no longer make
-			the cursor disappear.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/906">#906</a>] It is now
-			possible to have XHTML 1.0 Strict compliant output from a document pasted from Word.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/929">#929</a>] Pressing
-			the Enter key will now produce an undo step.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/934">#934</a>] Fixed the
-			"Cannot execute code from a freed script" error in IE from editor dialogs.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/942">#942</a>] Server
-			based spell checking with ColdFusion integration no longer breaks fir non en_US
-			languages.</li>
-		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/942">#1056</a>] Deleting
-			everything in the editor document and moving the cursor around will no longer leave
-			the cursor hanging beyond the top of the editor document.</li>
-	</ul>
-	<p>
-		# This version has been <a href="http://dev.fckeditor.net/wiki/SD/COE">partially sponsored</a>
-		by the <a href="http://www.coe.int/">Council of Europe</a>.
-	</p>
 	<h3>
 		Version 2.4.3</h3>
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange.js	(revision 1183)
@@ -441,16 +441,9 @@
 			"End" : [ this._Range.endOffset ]
 		} ;
-		// Since we're treating the document tree as normalized, we need to backtrack the text lengths
-		// of previous text nodes into the offset value.
 		var curStart = this._Range.startContainer.previousSibling ;
 		var curEnd = this._Range.endContainer.previousSibling ;
-
-		// 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 && curStart.nodeType == 3 )
 		{
 			bookmark.Start[0] += curStart.length ;
-			addrStart = curStart ;
 			curStart = curStart.previousSibling ;
 		}
@@ -458,39 +451,10 @@
 		{
 			bookmark.End[0] += curEnd.length ;
-			addrEnd = curEnd ;
 			curEnd = curEnd.previousSibling ;
 		}
-
-		// If the object pointed to by the startOffset and endOffset are text nodes, we need
-		// to backtrack and add in the text offset to the bookmark addresses.
-		if ( addrStart.nodeType == 1 && addrStart.childNodes[bookmark.Start[0]] && addrStart.childNodes[bookmark.Start[0]].nodeType == 3 )
-		{
-			var curNode = addrStart.childNodes[bookmark.Start[0]] ;
-			var offset = 0 ;
-			while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 )
-			{
-				curNode = curNode.previousSibling ;
-				offset += curNode.length ;
-			}
-			addrStart = curNode ;
-			bookmark.Start[0] = offset ;
-		}
-		if ( addrEnd.nodeType == 1 && addrEnd.childNodes[bookmark.End[0]] && addrEnd.childNodes[bookmark.End[0]].nodeType == 3 )
-		{
-			var curNode = addrEnd.childNodes[bookmark.End[0]] ;
-			var offset = 0 ;
-			while ( curNode.previousSibling && curNode.previousSibling.nodeType == 3 )
-			{
-				curNode = curNode.previousSibling ;
-				offset += curNode.length ;
-			}
-			addrEnd = curNode ;
-			bookmark.End[0] = offset ;
-		}
-
 		// Then, we record down the precise position of the container nodes
 		// by walking up the DOM tree and counting their childNode index
-		bookmark.Start = FCKDomTools.GetNodeAddress( addrStart, true ).concat( bookmark.Start ) ;
-		bookmark.End = FCKDomTools.GetNodeAddress( addrEnd, true ).concat( bookmark.End ) ;
+		bookmark.Start = FCKDomTools.GetNodeAddress( this._Range.startContainer, true ).concat( bookmark.Start ) ;
+		bookmark.End = FCKDomTools.GetNodeAddress( this._Range.endContainer, true ).concat( bookmark.End ) ;
 		return bookmark;
 	},
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_gecko.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_gecko.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_gecko.js	(revision 1183)
@@ -36,6 +36,5 @@
 	}
 	else
-		if ( this.Window.document )
-			this.MoveToElementStart( this.Window.document.body ) ;
+		this.MoveToElementStart( this.Window.document.body ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_ie.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_ie.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrange_ie.js	(revision 1183)
@@ -67,13 +67,13 @@
 }
 
-FCKDomRange.prototype.Select = function( forceExpand )
+FCKDomRange.prototype.Select = function()
 {
 	if ( this._Range )
-		this.SelectBookmark( this.CreateBookmark( true ), forceExpand ) ;
+		this.SelectBookmark( this.CreateBookmark( true ) ) ;
 }
 
 // Not compatible with bookmark created with CreateBookmark2.
 // The bookmark nodes will be deleted from the document.
-FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
+FCKDomRange.prototype.SelectBookmark = function( bookmark )
 {
 	var bIsCollapsed = this.CheckIsCollapsed() ;
@@ -112,5 +112,5 @@
 	else
 	{
-		bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
+		bIsStartMakerAlone = ( !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
 		
 		// Append a temporary <span>&nbsp;</span> before the selection.
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrangeiterator.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrangeiterator.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckdomrangeiterator.js	(revision 1183)
@@ -266,5 +266,4 @@
 					removePreviousBr = !splitInfo.WasStartOfBlock ;
 					removeLastBr = !splitInfo.WasEndOfBlock ;
-					FCKDebug.Output( 'removePreviousBr=' + removePreviousBr + ',removeLastBr=' + removeLastBr ) ;
 
 					// Insert the new block into the DOM.
@@ -287,11 +286,6 @@
 		{
 			var previousSibling = block.previousSibling ;
-			if ( previousSibling && previousSibling.nodeType == 1 )
-			{
-				if ( previousSibling.nodeName.toLowerCase() == 'br' )
-					previousSibling.parentNode.removeChild( previousSibling ) ;
-				else if ( previousSibling.lastChild && previousSibling.lastChild.nodeName.IEquals( 'br' ) )
-					previousSibling.removeChild( previousSibling.lastChild ) ;
-			}
+			if ( previousSibling && previousSibling.nodeType == 1 && previousSibling.nodeName.toLowerCase() == 'br' )
+				previousSibling.parentNode.removeChild( previousSibling ) ;
 		}
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckeditingarea.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckeditingarea.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckeditingarea.js	(revision 1183)
@@ -209,4 +209,22 @@
 			oDoc.designMode = 'on' ;
 
+			// Tell Gecko to use or not the <SPAN> tag for the bold, italic and underline.
+			try
+			{
+				oDoc.execCommand( 'styleWithCSS', false, FCKConfig.GeckoUseSPAN ) ;
+			}
+			catch (e)
+			{
+				// As evidenced here, useCSS is deprecated in favor of styleWithCSS:
+				// http://www.mozilla.org/editor/midas-spec.html
+				oDoc.execCommand( 'useCSS', false, !FCKConfig.GeckoUseSPAN ) ;
+			}
+
+			// Analyzing Firefox 1.5 source code, it seams that there is support for a
+			// "insertBrOnReturn" command. Applying it gives no error, but it doesn't
+			// gives the same behavior that you have with IE. It works only if you are
+			// already inside a paragraph and it doesn't render correctly in the first enter.
+			// oDoc.execCommand( 'insertBrOnReturn', false, false ) ;
+
 			// Tell Gecko (Firefox 1.5+) to enable or not live resizing of objects (by Alfonso Martinez)
 			oDoc.execCommand( 'enableObjectResizing', false, !FCKConfig.DisableObjectResizing ) ;
@@ -262,9 +280,14 @@
 				this._EnsureFocusIE() ;
 
-			this.Window.focus() ;
-
-			// In IE it can happen that the document is in theory focused but the active element is outside it
-			if ( FCKBrowserInfo.IsIE )
-				this._EnsureFocusIE() ;
+			if ( FCKBrowserInfo.IsSafari )
+				this.IFrame.focus() ;
+			else
+			{
+				this.Window.focus() ;
+
+				// In IE it can happen that the document is in theory focused but the active element is outside it
+				if ( FCKBrowserInfo.IsIE )
+					this._EnsureFocusIE() ;
+			}
 		}
 		else
@@ -288,19 +311,16 @@
 	var range = this.Document.selection.createRange() ;
 
+	// Only apply the fix when in a block and the block is empty.
 	var parentNode = range.parentElement() ;
-	var parentTag = parentNode.nodeName.toLowerCase() ;
-
-	// Only apply the fix when in a block, and the block is empty.
-	if ( parentNode.childNodes.length > 0 ||
-		 !( FCKListsLib.BlockElements[parentTag] || 
-		    FCKListsLib.NonEmptyBlockElements[parentTag] ) )
-	{
+
+	if ( ! ( parentNode.childNodes.length == 0 && ( 
+					FCKListsLib.BlockElements[parentNode.nodeName.toLowerCase()] || 
+					FCKListsLib.NonEmptyBlockElements[parentNode.nodeName.toLowerCase()] ) ) )
 		return ;
-	}
-
+
+	var oldLength = range.text.length ;
 	range.moveEnd( "character", 1 ) ;
 	range.select() ;
-
-	if ( range.boundingWidth > 0 )
+	if ( range.text.length > oldLength )
 	{
 		range.moveEnd( "character", -1 ) ;
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckenterkey.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckenterkey.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckenterkey.js	(revision 1183)
@@ -292,5 +292,5 @@
 			range.SetStart( previous, 2, true ) ;
 			range.Collapse( true ) ;
-			var oBookmark = range.CreateBookmark( true ) ;
+			var oBookmark = range.CreateBookmark() ;
 
 			// Move the contents of the block to the previous element and delete it.
@@ -301,5 +301,6 @@
 
 			// Place the selection at the bookmark.
-			range.SelectBookmark( oBookmark ) ;
+			range.MoveToBookmark( oBookmark ) ;
+			range.Select() ;
 
 			bCustom = true ;
@@ -342,5 +343,5 @@
 
 		var eNext = FCKDomTools.GetNextSourceElement( oCurrentBlock, true, [ oRange.StartBlockLimit.nodeName ],
-				['UL','OL','TR'], true ) ;
+				['UL','OL','TR'] ) ;
 
 		// Bug #1323 : if we're in a table cell, and the next node belongs to a different cell, then don't
@@ -417,9 +418,4 @@
 		if ( !oSplitInfo.WasStartOfBlock && !oSplitInfo.WasEndOfBlock )
 		{
-			// If the next block is an <li> with another list tree as the first child
-			// We'll need to append a placeholder or the list item wouldn't be editable. (Bug #1420)
-			if ( eNextBlock.nodeName.IEquals( 'li' ) && eNextBlock.firstChild
-					&& eNextBlock.firstChild.nodeName.IEquals( ['ul', 'ol'] ) )
-				eNextBlock.insertBefore( eNextBlock.ownerDocument.createTextNode( '\xa0' ), eNextBlock.firstChild ) ;
 			// Move the selection to the end block.
 			if ( eNextBlock )
@@ -437,4 +433,5 @@
 
 			var eNewBlock ;
+			var eFocusElement ;
 
 			if ( ePreviousBlock )
@@ -460,17 +457,14 @@
 			// available in the new block.
 			var elementPath = oSplitInfo.ElementPath ;
-			if ( elementPath )
-			{
-				var eFocusElement = eNewBlock ;
-				for ( var i = 0, len = elementPath.Elements.length ; i < len ; i++ )
-				{
-					var element = elementPath.Elements[i] ;
-
-					if ( element == elementPath.Block || element == elementPath.BlockLimit )
-						break ;
-
-					if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] )
-						eFocusElement = eFocusElement.appendChild( FCKDomTools.CloneElement( element ) ) ;
-				}
+			var eFocusElement = eNewBlock ;
+			for ( var i = 0, len = elementPath.Elements.length ; i < len ; i++ )
+			{
+				var element = elementPath.Elements[i] ;
+
+				if ( element == elementPath.Block || element == elementPath.BlockLimit )
+					break ;
+
+				if ( FCKListsLib.InlineChildReqElements[ element.nodeName.toLowerCase() ] )
+					eFocusElement = eFocusElement.appendChild( FCKDomTools.CloneElement( element ) ) ;
 			}
 
@@ -491,10 +485,8 @@
 			// Move the selection to the new block.
 			oRange.MoveToElementEditStart( bIsStartOfBlock && !bIsEndOfBlock ? eNextBlock : eNewBlock ) ;
-		}
-
-		if ( FCKBrowserInfo.IsSafari )
-			FCKDomTools.ScrollIntoView( eNextBlock || eNewBlock, false ) ;
-		else if ( FCKBrowserInfo.IsGeckoLike )
-			( eNextBlock || eNewBlock ).scrollIntoView( false ) ;
+
+			if ( FCKBrowserInfo.IsGeckoLike )
+				eNewBlock.scrollIntoView( false ) ;
+		}
 
 		oRange.Select() ;
@@ -527,5 +519,4 @@
 
 		var bHasShift = this._HasShift ;
-		var bIsPre = false ;
 
 		if ( !bHasShift && sStartBlockTag == 'LI' )
@@ -547,7 +538,6 @@
 		else
 		{
-			var eLineBreak ;
-			bIsPre = sStartBlockTag.IEquals( 'pre' ) ;
-			if ( bIsPre )
+			var eLineBreak = null ;
+			if ( sStartBlockTag.IEquals( 'pre' ) )
 				eLineBreak = this.Window.document.createTextNode( FCKBrowserInfo.IsIE ? '\r' : '\n' ) ;
 			else
@@ -576,12 +566,6 @@
 				else
 					dummy = this.Window.document.createElement( 'br' ) ;
-
 				eLineBreak.parentNode.insertBefore( dummy, eLineBreak.nextSibling ) ;
-
-				if ( FCKBrowserInfo.IsSafari )
-					FCKDomTools.ScrollIntoView( dummy, false ) ;
-				else
-					dummy.scrollIntoView( false ) ;
-
+				dummy.scrollIntoView( false ) ;
 				dummy.parentNode.removeChild( dummy ) ;
 			}
@@ -591,5 +575,5 @@
 		oRange.Collapse( true ) ;
 
-		oRange.Select( bIsPre ) ;
+		oRange.Select() ;
 	}
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckevents.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckevents.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckevents.js	(revision 1183)
@@ -35,10 +35,5 @@
 		this._RegisteredEvents[ eventName ] = [ functionPointer ] ;
 	else
-	{
-		// Check that the event handler isn't already registered with the same listener
-		// It doesn't detect function pointers belonging to an object (at least in Gecko)
-		if ( aTargets.IndexOf( functionPointer ) == -1 )
-			aTargets.push( functionPointer ) ;
-	}
+		aTargets.push( functionPointer ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckmenublock.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckmenublock.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckmenublock.js	(revision 1183)
@@ -96,7 +96,4 @@
 function FCKMenuBlock_Item_OnClick( clickedItem, menuBlock )
 {
-	if ( menuBlock.Hide )
-		menuBlock.Hide() ;
-
 	FCKTools.RunFunction( menuBlock.OnClick, menuBlock, [ clickedItem ] ) ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckpanel.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckpanel.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckpanel.js	(revision 1183)
@@ -169,15 +169,5 @@
 
 		if ( this.ParentPanel )
-		{
 			this.ParentPanel.Lock() ;
-
-			// Due to a bug on FF3, we must ensure that the parent panel will
-			// blur (#1584).
-			FCKPanel_Window_OnBlur( null, this.ParentPanel ) ;
-		}
-
-		// Be sure we'll not have more than one Panel opened at the same time.
-		if ( FCKPanel._OpenedPanel )
-			FCKPanel._OpenedPanel.Hide() ;
 
 		FCKDomTools.SetElementStyles( eMainNode,
@@ -201,24 +191,15 @@
 		iMainWidth = eMainNode.offsetWidth || eMainNode.firstChild.offsetWidth ;
 
-		// Base the popup coordinates upon the coordinates of relElement.
-		var oPos = FCKTools.GetDocumentPosition( this._Window,
+		var oPos = FCKTools.GetElementPosition(
 			relElement.nodeType == 9 ?
 				( FCKTools.IsStrictMode( relElement ) ? relElement.documentElement : relElement.body ) :
-				relElement ) ;
-
-		// Minus the offsets provided by any positioned parent element of the panel iframe.
-		var positionedAncestor = FCKDomTools.GetPositionedAncestor( FCKTools.GetElementWindow( this._IFrame ), this._IFrame.parentNode ) ;
-		if ( positionedAncestor )
-		{
-			var nPos = FCKTools.GetDocumentPosition( FCKTools.GetElementWindow( positionedAncestor ), positionedAncestor ) ;
-			oPos.x -= nPos.x ;
-			oPos.y -= nPos.y ;
-		}
+				relElement,
+			this._Window ) ;
 
 		if ( this.IsRTL && !this.IsContextMenu )
 			x = ( x * -1 ) ;
 
-		x += oPos.x ;
-		y += oPos.y ;
+		x += oPos.X ;
+		y += oPos.Y ;
 
 		if ( this.IsRTL )
@@ -262,6 +243,4 @@
 		// Move the focus to the IFRAME so we catch the "onblur".
 		this._IFrame.contentWindow.focus() ;
-
-		FCKPanel._OpenedPanel = this ;
 	}
 
@@ -277,5 +256,5 @@
 	else
 	{
-		if ( !this._IsOpened || this._LockCounter > 0 )
+		if ( !this._IsOpened )
 			return ;
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckspecialcombo.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckspecialcombo.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckspecialcombo.js	(revision 1183)
@@ -82,5 +82,8 @@
 {
 	if ( this.Items )
-		this.Items = {} ;
+	{
+		for ( var key in this.Items )
+			this.Items[key] = null ;
+	}
 	
 	var itemsholder = this._ItemsHolderEl ;
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckstyle.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckstyle.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/classes/fckstyle.js	(revision 1183)
@@ -865,6 +865,6 @@
 			{
 				// Check if the style element can be a child of the current
-				// node parent or if the element is not defined in the DTD.
-				if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] || !FCK.DTD[ elementName ] )
+				// node parent.
+				if ( ( FCK.DTD[ currentNode.parentNode.nodeName.toLowerCase() ] || FCK.DTD.span )[ elementName ] )
 				{
 					// This node will be part of our range, so if it has not
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fck_othercommands.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fck_othercommands.js	(revision 1183)
@@ -251,13 +251,5 @@
 
 	var oFakeImage = FCKDocumentProcessor_CreateFakeImage( 'FCK__PageBreak', e ) ;
-	var oRange = new FCKDomRange( FCK.EditorWindow ) ;
-	oRange.MoveToSelection() ;
-	var oSplitInfo = oRange.SplitBlock() ;
-	if ( oSplitInfo.NextBlock )
-		oSplitInfo.NextBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.NextBlock ) ;
-	else
-		oSplitInfo.PreviousBlock.parentNode.insertBefore( oFakeImage, oSplitInfo.PreviousBlock.nextSibling ) ;
-
-	FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+	FCK.InsertElement( oFakeImage ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckblockquotecommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckblockquotecommand.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckblockquotecommand.js	(revision 1183)
@@ -33,50 +33,7 @@
 
 		var state = this.GetState() ;
-
 		var range = new FCKDomRange( FCK.EditorWindow ) ;
 		range.MoveToSelection() ;
-
 		var bookmark = range.CreateBookmark() ;
-
-		// Kludge for #1592: if the bookmark nodes are in the beginning of
-		// blockquote, then move them to the nearest block element in the
-		// blockquote.
-		if ( FCKBrowserInfo.IsIE )
-		{
-			var bStart	= range.GetBookmarkNode( bookmark, true ) ;
-			var bEnd	= range.GetBookmarkNode( bookmark, false ) ;
-			
-			var cursor ;
-			
-			if ( bStart 
-					&& bStart.parentNode.nodeName.IEquals( 'blockquote' )
-					&& !bStart.previousSibling )
-			{
-				cursor = bStart ;
-				while ( ( cursor = cursor.nextSibling ) )
-				{
-					if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
-						FCKDomTools.MoveNode( bStart, cursor, true ) ;
-				}
-			}
-
-			if ( bEnd 
-					&& bEnd.parentNode.nodeName.IEquals( 'blockquote' )
-					&& !bEnd.previousSibling )
-			{
-				cursor = bEnd ;
-				while ( ( cursor = cursor.nextSibling ) )
-				{
-					if ( FCKListsLib.BlockElements[ cursor.nodeName.toLowerCase() ] )
-					{
-						if ( cursor.firstChild == bStart )
-							FCKDomTools.InsertAfterNode( bStart, bEnd ) ;
-						else
-							FCKDomTools.MoveNode( bEnd, cursor, true ) ;
-					}
-				}
-			}
-		}
-
 		var iterator = new FCKDomRangeIterator( range ) ;
 		var block ;
@@ -88,17 +45,4 @@
 			while ( ( block = iterator.GetNextParagraph() ) )
 				paragraphs.push( block ) ;
-
-			// If no paragraphs, create one from the current selection position.
-			if ( paragraphs.length < 1 )
-			{
-				para = range.Window.document.createElement( FCKConfig.EnterMode.IEquals( 'p' ) ? 'p' : 'div' ) ;
-				range.InsertNode( para ) ;
-				para.appendChild( range.Window.document.createTextNode( '\ufeff' ) ) ;
-				range.MoveToBookmark( bookmark ) ;
-				range.MoveToNodeContents( para ) ;
-				range.Collapse( true ) ;
-				bookmark = range.CreateBookmark() ;
-				paragraphs.push( para ) ;
-			}
 
 			// Make sure all paragraphs have the same parent.
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckshowblocks.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckshowblocks.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fckshowblocks.js	(revision 1183)
@@ -53,10 +53,12 @@
 		return FCK_TRISTATE_DISABLED ;
 
-	// On some cases FCK.EditorDocument.body is not yet available
-	if ( !FCK.EditorDocument )
-		return FCK_TRISTATE_OFF ;
-
-	if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) )
-		return FCK_TRISTATE_ON ;
+	// On some cases FCK.EditorDocument.body is not yet available, so try/catch.
+	try
+	{
+		if ( /FCK__ShowBlocks(?:\s|$)/.test( FCK.EditorDocument.body.className ) )
+			return FCK_TRISTATE_ON ;
+	}
+	catch (e)
+	{}
 
 	return FCK_TRISTATE_OFF ;
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcktextcolorcommand.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcktextcolorcommand.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/commandclasses/fcktextcolorcommand.js	(revision 1183)
@@ -55,6 +55,4 @@
 FCKTextColorCommand.prototype.SetColor = function( color )
 {
-	FCKUndo.SaveUndoStep() ;
-
 	var style = FCKStyles.GetStyle( '_FCK_' +
 		( this.Type == 'ForeColor' ? 'Color' : 'BackColor' ) ) ;
@@ -67,6 +65,4 @@
 		FCKStyles.ApplyStyle( style ) ;
 	}
-
-	FCKUndo.SaveUndoStep() ;
 
 	FCK.Focus() ;
@@ -146,6 +142,5 @@
 	FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_AutoOnClick, this ) ;
 
-	// Dirty hack for Opera, Safari and Firefox 3.
-	if ( !FCKBrowserInfo.IsIE )
+	if ( FCKBrowserInfo.IsSafari )
 		oDiv.style.width = '96%' ;
 
@@ -159,22 +154,14 @@
 		var oRow = oTable.insertRow(-1) ;
 
-		for ( var i = 0 ; i < 8 ; i++, iCounter++ )
+		for ( var i = 0 ; i < 8 && iCounter < aColors.length ; i++, iCounter++ )
 		{
-			// The div will be created even if no more colors are available.
-			// Extra divs will be hidden later in the code. (#1597)
-			if ( iCounter < aColors.length )
-			{
-				var colorParts = aColors[iCounter].split('/') ;
-				var colorValue = '#' + colorParts[0] ;
-				var colorName = colorParts[1] || colorValue ;
-			}
+			var colorParts = aColors[iCounter].split('/') ;
+			var colorValue = '#' + colorParts[0] ;
+			var colorName = colorParts[1] || colorValue ;
 
 			oDiv = oRow.insertCell(-1).appendChild( CreateSelectionDiv() ) ;
 			oDiv.innerHTML = '<div class="ColorBoxBorder"><div class="ColorBox" style="background-color: ' + colorValue + '"></div></div>' ;
 
-			if ( iCounter >= aColors.length )
-				oDiv.style.visibility = 'hidden' ;
-			else
-				FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
+			FCKTools.AddEventListenerEx( oDiv, 'click', FCKTextColorCommand_OnClick, [ this, colorName ] ) ;
 		}
 	}
@@ -192,6 +179,5 @@
 	}
 
-	// Dirty hack for Opera, Safari and Firefox 3.
-	if ( !FCKBrowserInfo.IsIE )
+	if ( FCKBrowserInfo.IsSafari )
 		oDiv.style.width = '96%' ;
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck.js	(revision 1183)
@@ -59,11 +59,5 @@
 			return ( this.StartupValue != this.EditingArea.Textarea.value ) ;
 		else
-		{
-			// It can happen switching between design and source mode in Gecko
-			if ( ! this.EditorDocument )
-				return false ;
-
 			return ( this.StartupValue != this.EditorDocument.body.innerHTML ) ;
-		}
 	},
 
@@ -113,10 +107,4 @@
 		// Tab key handling for source mode.
 		FCKTools.AddEventListener( document, "keydown", this._TabKeyHandler ) ;
-
-		// Add selection change listeners. They must be attached only once.
-		this.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ;
-		if ( FCKBrowserInfo.IsGecko )
-			this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ;
-
 	},
 
@@ -179,7 +167,5 @@
 				// Element Node.
 				case 1 :
-					if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] && 
-							!oNode.getAttribute('_fckfakelement') &&
-							oNode.getAttribute('_moz_dirty') == null )
+					if ( !FCKListsLib.BlockElements[ oNode.nodeName.toLowerCase() ] )
 						bMoveNode = true ;
 					break ;
@@ -273,21 +259,7 @@
 	OnDoubleClick : function( element )
 	{
-		var oCalls = FCK.RegisteredDoubleClickHandlers[ element.tagName.toUpperCase() ] ;
-
-		if ( oCalls )
-		{
-			for ( var i = 0 ; i < oCalls.length ; i++ )
-				oCalls[ i ]( element ) ;
-		}
-
-		// Generic handler for any element
-		oCalls = FCK.RegisteredDoubleClickHandlers[ '*' ] ;
-
-		if ( oCalls )
-		{
-			for ( var i = 0 ; i < oCalls.length ; i++ )
-				oCalls[ i ]( element ) ;
-		}
-
+		var oHandler = FCK.RegisteredDoubleClickHandlers[ element.tagName ] ;
+		if ( oHandler )
+			oHandler( element ) ;
 	},
 
@@ -295,19 +267,5 @@
 	RegisterDoubleClickHandler : function( handlerFunction, tag )
 	{
-		var nodeName = tag || '*' ;
-		nodeName = nodeName.toUpperCase() ;
-
-		var aTargets ;
-
-		if ( !( aTargets = FCK.RegisteredDoubleClickHandlers[ nodeName ] ) )
-			FCK.RegisteredDoubleClickHandlers[ nodeName ] = [ handlerFunction ] ;
-		else
-		{
-			// Check that the event handler isn't already registered with the same listener
-			// It doesn't detect function pointers belonging to an object (at least in Gecko)
-			if ( aTargets.IndexOf( handlerFunction ) == -1 )
-				aTargets.push( handlerFunction ) ;
-		}
-	
+		FCK.RegisteredDoubleClickHandlers[ tag.toUpperCase() ] = handlerFunction ;
 	},
 
@@ -330,7 +288,4 @@
 		// <IMG> src
 		html = html.replace( FCKRegexLib.ProtectUrlsImg	, '$& _fcksavedurl=$1' ) ;
-
-		// <AREA> href
-		html = html.replace( FCKRegexLib.ProtectUrlsArea	, '$& _fcksavedurl=$1' ) ;
 
 		return html ;
@@ -387,10 +342,4 @@
 	{
 		this.EditingArea.Mode = FCK.EditMode ;
-
-		// If there was an onSelectionChange listener in IE we must remove it to avoid crashes #1498
-		if ( FCKBrowserInfo.IsIE && FCK.EditorDocument )
-		{
-				FCK.EditorDocument.detachEvent("onselectionchange", Doc_OnSelectionChange ) ;
-		}
 
 		if ( FCK.EditMode == FCK_EDITMODE_WYSIWYG )
@@ -961,6 +910,4 @@
 	if ( ! FCKBrowserInfo.IsIE && FCKDomTools.PaddingNode )
 	{
-		// Prevent the caret from going between the body and the padding node in Firefox.
-		// i.e. <body>|<p></p></body>
 		var sel = FCK.EditorWindow.getSelection() ;
 		if ( sel && sel.rangeCount == 1 )
@@ -976,29 +923,4 @@
 		}
 	}
-	else if ( FCKDomTools.PaddingNode )
-	{
-		// Prevent the caret from going into an empty body but not into the padding node in IE.
-		// i.e. <body><p></p>|</body>
-		var parentElement = FCKSelection.GetParentElement() ;
-		var paddingNode = FCKDomTools.PaddingNode ;
-		if ( parentElement && parentElement.nodeName.IEquals( 'body' ) )
-		{
-			if ( FCK.EditorDocument.body.childNodes.length == 1 
-					&& FCK.EditorDocument.body.firstChild == paddingNode )
-			{
-				var range = FCK.EditorDocument.body.createTextRange() ;
-				var clearContents = false ;
-				if ( !paddingNode.childNodes.firstChild )
-				{
-					paddingNode.appendChild( paddingNode.ownerDocument.createTextNode( '\ufeff' ) ) ;
-					clearContents = true ;
-				}
-				range.moveToElementText( paddingNode ) ;
-				range.select() ;
-				if ( clearContents )
-					range.pasteHTML( '' ) ;
-			}
-		}
-	}
 }
 
@@ -1010,4 +932,5 @@
 
 	FCK.InitializeBehaviors() ;
+	FCK.AttachToOnSelectionChange( _FCK_PaddingNodeListener ) ;
 
 	// Listen for mousedown and mouseup events for tracking drag and drops.
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck_gecko.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck_gecko.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck_gecko.js	(revision 1183)
@@ -143,6 +143,5 @@
 					&& node.parentNode != FCK.EditorDocument.documentElement
 					&& node == node.parentNode.lastChild
-					&& ( ! FCKListsLib.BlockElements[node.parentNode.tagName.toLowerCase()]
-					  && ! FCKListsLib.NonEmptyBlockElements[node.parentNode.tagName.toLowerCase()] ) )
+					&& ( ! FCKListsLib.BlockElements[node.parentNode.tagName.toLowerCase()] ) )
 					node = node.parentNode ;
 
@@ -173,6 +172,5 @@
 
 						var stopTag = stopNode.tagName.toLowerCase() ;
-						if ( FCKListsLib.BlockElements[stopTag] || FCKListsLib.EmptyElements[stopTag] 
-							|| FCKListsLib.NonEmptyBlockElements[stopTag] )
+						if ( FCKListsLib.BlockElements[stopTag] || FCKListsLib.EmptyElements[stopTag] )
 							break ;
 						stopNode = stopNode.nextSibling ;
@@ -199,4 +197,26 @@
 	}
 
+	this._FillEmptyBlock = function( emptyBlockNode )
+	{
+		if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 )
+			return ;
+		var nodeTag = emptyBlockNode.tagName.toLowerCase() ;
+		if ( nodeTag != 'p' && nodeTag != 'div' )
+			return ;
+		if ( emptyBlockNode.firstChild )
+			return ;
+		FCKTools.AppendBogusBr( emptyBlockNode ) ;
+	}
+
+	this._ExecCheckEmptyBlock = function()
+	{
+		FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
+		var sel = FCK.EditorWindow.getSelection() ;
+		if ( !sel || sel.rangeCount < 1 )
+			return ;
+		var range = sel.getRangeAt( 0 );
+		FCK._FillEmptyBlock( range.startContainer ) ;
+	}
+
 	this.ExecOnSelectionChangeTimer = function()
 	{
@@ -266,4 +286,6 @@
 		this.EditorDocument.addEventListener( 'click', this._ExecCheckCaret, false ) ;
 	}
+	if ( FCKBrowserInfo.IsGecko )
+		this.AttachToOnSelectionChange( this._ExecCheckEmptyBlock ) ;
 
 	// Reset the context menu.
@@ -429,11 +451,4 @@
 			var oLink = oLinksInteractor.snapshotItem( i ) ;
 			oLink.href = url ;
-
-			// It may happen that the browser (aka Safari) decides to use the
-			// URL as the link content to not leave it empty. In this case,
-			// let's reset it.
-			if ( sTempUrl == oLink.innerHTML )
-				oLink.innerHTML = '' ;
-
 			aCreatedLinks.push( oLink ) ;
 		}
@@ -442,24 +457,2 @@
 	return aCreatedLinks ;
 }
-
-FCK._FillEmptyBlock = function( emptyBlockNode )
-{
-	if ( ! emptyBlockNode || emptyBlockNode.nodeType != 1 )
-		return ;
-	var nodeTag = emptyBlockNode.tagName.toLowerCase() ;
-	if ( nodeTag != 'p' && nodeTag != 'div' )
-		return ;
-	if ( emptyBlockNode.firstChild )
-		return ;
-	FCKTools.AppendBogusBr( emptyBlockNode ) ;
-}
-
-FCK._ExecCheckEmptyBlock = function()
-{
-	FCK._FillEmptyBlock( FCK.EditorDocument.body.firstChild ) ;
-	var sel = FCK.EditorWindow.getSelection() ;
-	if ( !sel || sel.rangeCount < 1 )
-		return ;
-	var range = sel.getRangeAt( 0 );
-	FCK._FillEmptyBlock( range.startContainer ) ;
-}
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck_ie.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck_ie.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fck_ie.js	(revision 1183)
@@ -93,7 +93,5 @@
 function Doc_OnSelectionChange()
 {
-	// Don't fire the event if no document is loaded.
-	if ( FCK.EditorDocument )
-		FCK.Events.FireEvent( "OnSelectionChange" ) ;
+	FCK.Events.FireEvent( "OnSelectionChange" ) ;
 }
 
@@ -286,19 +284,6 @@
 		sText = FCKTools.ProcessLineBreaks( window, FCKConfig, sText ) ;
 
-		var closeTagIndex = sText.search( '</p>' ) ;
-		var startTagIndex = sText.search( '<p>' ) ;
-
-		if ( ( closeTagIndex != -1 && startTagIndex != -1 && closeTagIndex < startTagIndex ) 
-				|| ( closeTagIndex != -1 && startTagIndex == -1 ) )
-		{
-			var prefix = sText.substr( 0, closeTagIndex ) ;
-			sText = sText.substr( closeTagIndex + 4 ) ;
-			this.InsertHtml( prefix ) ;
-		}
-
 		// Insert the resulting data in the editor.
-		FCKUndo.SaveLocked = true ;
 		this.InsertHtml( sText ) ;
-		FCKUndo.SaveLocked = false ;
 	}
 }
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckcommands.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckcommands.js	(revision 1183)
@@ -65,6 +65,6 @@
 		case 'SpecialChar'	: oCommand = new FCKDialogCommand( 'SpecialChar', FCKLang.DlgSpecialCharTitle	, 'dialog/fck_specialchar.html'	, 400, 280 ) ; break ;
 		case 'Smiley'		: oCommand = new FCKDialogCommand( 'Smiley'		, FCKLang.DlgSmileyTitle		, 'dialog/fck_smiley.html'		, FCKConfig.SmileyWindowWidth, FCKConfig.SmileyWindowHeight ) ; break ;
-		case 'Table'		: oCommand = new FCKDialogCommand( 'Table'		, FCKLang.DlgTableTitle			, 'dialog/fck_table.html'		, 480, 210 ) ; break ;
-		case 'TableProp'	: oCommand = new FCKDialogCommand( 'Table'		, FCKLang.DlgTableTitle			, 'dialog/fck_table.html?Parent', 480, 210 ) ; break ;
+		case 'Table'		: oCommand = new FCKDialogCommand( 'Table'		, FCKLang.DlgTableTitle			, 'dialog/fck_table.html'		, 450, 210 ) ; break ;
+		case 'TableProp'	: oCommand = new FCKDialogCommand( 'Table'		, FCKLang.DlgTableTitle			, 'dialog/fck_table.html?Parent', 400, 210 ) ; break ;
 		case 'TableCellProp': oCommand = new FCKDialogCommand( 'TableCell'	, FCKLang.DlgCellTitle			, 'dialog/fck_tablecell.html'	, 550, 210 ) ; break ;
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdocumentprocessor.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdocumentprocessor.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdocumentprocessor.js	(revision 1183)
@@ -128,6 +128,4 @@
 	*/
 
-	var bIsDirty = FCK.IsDirty() ;
-
 	var aEmbeds = document.getElementsByTagName( 'EMBED' ) ;
 
@@ -155,8 +153,4 @@
 		}
 	}
-
-	// Fix the IsDirty state (#1406).
-	if ( !bIsDirty )
-		FCK.ResetIsDirty() ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckdomtools.js	(revision 1183)
@@ -117,5 +117,5 @@
 		}
 
-		if ( !FCKBrowserInfo.IsIE && !FCKBrowserInfo.IsOpera )
+		if ( !FCKBrowserInfo.IsIE )
 		{
 			eChildNode = node.lastChild ;
@@ -243,7 +243,7 @@
 	 *				must be ignored during the search.
 	 */
-	GetNextSourceElement : function( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements, startFromSibling )
-	{
-		while( ( currentNode = this.GetNextSourceNode( currentNode, startFromSibling ) ) )	// Only one "=".
+	GetNextSourceElement : function( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements )
+	{
+		while( ( currentNode = this.GetNextSourceNode( currentNode, true ) ) )	// Only one "=".
 		{
 			if ( currentNode.nodeType == 1 )
@@ -252,8 +252,6 @@
 					break ;
 
-				if ( ignoreElements && currentNode.nodeName.IEquals( ignoreElements ) )
-					return this.GetNextSourceElement( currentNode, ignoreSpaceTextOnly, stopSearchElements, ignoreElements ) ;
-
-				return currentNode ;
+				if ( !ignoreElements || !currentNode.nodeName.IEquals( ignoreElements ) )
+					return currentNode ;
 			}
 			else if ( ignoreSpaceTextOnly && currentNode.nodeType == 3 && currentNode.nodeValue.RTrim().length > 0 )
@@ -315,5 +313,5 @@
 				return this.GetPreviousSourceNode( currentNode.parentNode, true, nodeType, stopSearchNode ) ;
 		}
-
+		
 		if ( nodeType && node && node.nodeType != nodeType )
 			return this.GetPreviousSourceNode( node, false, nodeType, stopSearchNode ) ;
@@ -395,26 +393,11 @@
 	{
 		// In IE it can happen when the page is reloaded that doc or doc.body is null, so exit here
-		try
-		{
-			if ( !doc || !doc.body )
-				return ;
-		}
-		catch (e)
-		{
+		if ( !doc || !doc.body )
 			return ;
-		}
 
 		this.CheckAndRemovePaddingNode( doc, tagName, true ) ;
-		try
-		{
-			if ( doc.body.lastChild && ( doc.body.lastChild.nodeType != 1
-					|| doc.body.lastChild.tagName.toLowerCase() == tagName.toLowerCase() ) )
-				return ;
-		}
-		catch (e)
-		{
+		if ( doc.body.lastChild && ( doc.body.lastChild.nodeType != 1
+				|| doc.body.lastChild.tagName.toLowerCase() == tagName.toLowerCase() ) )
 			return ;
-		}
-
 		var node = doc.createElement( tagName ) ;
 		if ( FCKBrowserInfo.IsGecko && FCKListsLib.NonEmptyBlockElements[ tagName ] )
@@ -438,20 +421,12 @@
 
 		// If the padding node is changed, remove its status as a padding node.
-		try
-		{
-			if ( paddingNode.parentNode != doc.body
-				|| paddingNode.tagName.toLowerCase() != tagName
-				|| ( paddingNode.childNodes.length > 1 )
-				|| ( paddingNode.firstChild && paddingNode.firstChild.nodeValue != '\xa0'
-					&& String(paddingNode.firstChild.tagName).toLowerCase() != 'br' ) )
-			{
-				this.PaddingNode = null ;
-				return ;
-			}
-		}
-		catch (e)
-		{
-				this.PaddingNode = null ;
-				return ;
+		if ( paddingNode.parentNode != doc.body
+			|| paddingNode.tagName.toLowerCase() != tagName
+			|| ( paddingNode.childNodes.length > 1 )
+			|| ( paddingNode.firstChild && paddingNode.firstChild.nodeValue != '\xa0'
+				&& String(paddingNode.firstChild.tagName).toLowerCase() != 'br' ) )
+		{
+			this.PaddingNode = null ;
+			return ;
 		}
 
@@ -964,41 +939,5 @@
 		}
 		return null ;
-	},
-
-	/**
-	 * Current implementation for ScrollIntoView (due to #1462). We don't have
-	 * a complete implementation here, just the things that fit our needs.
-	 */
-	ScrollIntoView : function( element, alignTop )
-	{
-		// Get the element window.
-		var window = FCKTools.GetElementWindow( element ) ;
-		var windowHeight = FCKTools.GetViewPaneSize( window ).Height ;
-		
-		// Starts the offset that will be scrolled with the negative value of
-		// the visible window height.
-		var offset = windowHeight * -1 ;
-
-		// Appends the height it we are about to align the bottoms.
-		if ( alignTop === false )
-		{
-			offset += element.offsetHeight ;
-			
-			// Consider the margin in the scroll, which is ok for our current
-			// needs, but needs investigation if we will be using this function
-			// in other places.
-			offset += parseInt( this.GetCurrentElementStyle( window, element, 'marginBottom' ) || 0, 10 ) ;
-		}
-
-		// Appends the offsets for the entire element hierarchy.
-		offset += element.offsetTop ;
-		while ( ( element = element.offsetParent ) )
-			offset += element.offsetTop || 0 ;
-		
-		// Scroll the window to the desired position, if not already visible.
-		var currentScroll = FCKTools.GetScrollPosition( window ).Y ;
-		if ( offset > 0 && offset > currentScroll )
-			window.scrollTo( 0, offset ) ;
-  	}
+	}
 } ;
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckregexlib.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckregexlib.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckregexlib.js	(revision 1183)
@@ -75,5 +75,4 @@
 ProtectUrlsImg	: /<img(?=\s).*?\ssrc=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 ProtectUrlsA	: /<a(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
-ProtectUrlsArea	: /<area(?=\s).*?\shref=((?:(?:\s*)("|').*?\2)|(?:[^"'][^ >]+))/gi ,
 
 Html4DocType	: /HTML 4\.0 Transitional/i ,
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckselection_gecko.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckselection_gecko.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckselection_gecko.js	(revision 1183)
@@ -58,19 +58,16 @@
 	if ( selection && selection.anchorNode && selection.anchorNode.nodeType == 1 )
 	{
-		if ( this.GetType() == 'Control' )
-		{
-			// This one is good for all browsers, expect Safari Mac.
-			selectedElement = selection.anchorNode.childNodes[ selection.anchorOffset ] ;
-
-			// For Safari (Mac only), the anchor node for a control selection is
-			// the control itself, which seams logic. FF and Opera use the parent
-			// as the anchor node, pointing to the control with the offset.
-			// As FF created the selection "standard", Safari would do better by
-			// following their steps.
-			if ( !selectedElement )
-				selectedElement = selection.anchorNode ;
-			else if ( selectedElement.nodeType != 1 )
-				return null ;
-		}
+		// This one is good for all browsers, expect Safari Mac.
+		selectedElement = selection.anchorNode.childNodes[ selection.anchorOffset ] ;
+
+		// For Safari (Mac only), the anchor node for a control selection is
+		// the control itself, which seams logic. FF and Opera use the parent
+		// as the anchor node, pointing to the control with the offset.
+		// As FF created the selection "standard", Safari would do better by
+		// following their steps.
+		if ( !selectedElement )
+			selectedElement = selection.anchorNode ;
+		else if ( selectedElement.nodeType != 1 )
+			return null ;
 	}
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktoolbarset.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktoolbarset.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktoolbarset.js	(revision 1183)
@@ -91,5 +91,5 @@
 			// Initialize the IFRAME document body.
 			eTargetDocument.open() ;
-			eTargetDocument.write( '<html><head>' + sBase + '<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; window.onresize = adjust; window.onload = function () {window.setTimeout( adjust, 0 );}</script></head><body style="overflow: hidden">' + document.getElementById( 'xToolbarSpace' ).innerHTML + '</body></html>' ) ;
+			eTargetDocument.write( '<html><head>' + sBase + '<script type="text/javascript"> var adjust = function() { window.frameElement.height = document.body.scrollHeight ; }; window.onresize = adjust; window.onload = function () {adjust(); window.setTimeout( adjust, 1000 ); }</script></head><body style="overflow: hidden">' + document.getElementById( 'xToolbarSpace' ).innerHTML + '</body></html>' ) ;
 			eTargetDocument.close() ;
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fcktools.js	(revision 1183)
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckundo.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckundo.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckundo.js	(revision 1183)
@@ -28,5 +28,4 @@
 FCKUndo.MaxTypes = 25 ;
 FCKUndo.Typing = false ;
-FCKUndo.SaveLocked = false ;
 
 FCKUndo._GetBookmark = function()
@@ -116,5 +115,5 @@
 FCKUndo.SaveUndoStep = function()
 {
-	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG || this.SaveLocked )
+	if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
 		return ;
 
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml.js	(revision 1183)
@@ -199,6 +199,5 @@
 
 			// Ignore bogus BR nodes in the DOM.
-			if ( FCKBrowserInfo.IsGecko &&
-					htmlNode.nextSibling &&
+			if ( FCKBrowserInfo.IsGecko && 
 					( htmlNode.hasAttribute('_moz_editor_bogus_node') || htmlNode.getAttribute( 'type' ) == '_moz' ) )
 				return false ;
@@ -314,4 +313,17 @@
 FCKXHtml.TagProcessors =
 {
+	img : function( node, htmlNode )
+	{
+		// The "ALT" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'alt' ) )
+			FCKXHtml._AppendAttribute( node, 'alt', '' ) ;
+
+		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
+		if ( sSavedUrl != null )
+			FCKXHtml._AppendAttribute( node, 'src', sSavedUrl ) ;
+
+		return node ;
+	},
+
 	a : function( node, htmlNode )
 	{
@@ -338,66 +350,45 @@
 	},
 
-	area : function( node, htmlNode )
-	{
-		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
-		if ( sSavedUrl != null )
-			FCKXHtml._AppendAttribute( node, 'href', sSavedUrl ) ;
-
-		// IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually.
-		if ( FCKBrowserInfo.IsIE )
-		{
-			if ( ! node.attributes.getNamedItem( 'coords' ) )
-			{
-				var sCoords = htmlNode.getAttribute( 'coords', 2 ) ;
-				if ( sCoords && sCoords != '0,0,0' )
-					FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ;
-			}
-
-			if ( ! node.attributes.getNamedItem( 'shape' ) )
-			{
-				var sShape = htmlNode.getAttribute( 'shape', 2 ) ;
-				if ( sShape && sShape.length > 0 )
-					FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ;
-			}
-		}
-
-		return node ;
-	},
-
-	body : function( node, htmlNode )
-	{
-		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
-		// Remove spellchecker attributes added for Firefox when converting to HTML code (Bug #1351).
-		node.removeAttribute( 'spellcheck' ) ;
-		return node ;
-	},
-
-	// IE loses contents of iframes, and Gecko does give it back HtmlEncoded
-	// Note: Opera does lose the content and doesn't provide it in the innerHTML string
-	iframe : function( node, htmlNode )
-	{
-		var sHtml = htmlNode.innerHTML ;
-
-		// Gecko does give back the encoded html
-		if ( FCKBrowserInfo.IsGecko )
-			sHtml = FCKTools.HTMLDecode( sHtml );
-
-		// Remove the saved urls here as the data won't be processed as nodes
-		sHtml = sHtml.replace( /\s_fcksavedurl="[^"]*"/g, '' ) ;
-
-		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( sHtml ) ) ) ;
-
-		return node ;
-	},
-
-	img : function( node, htmlNode )
-	{
-		// The "ALT" attribute is required in XHTML.
-		if ( ! node.attributes.getNamedItem( 'alt' ) )
-			FCKXHtml._AppendAttribute( node, 'alt', '' ) ;
-
-		var sSavedUrl = htmlNode.getAttribute( '_fcksavedurl' ) ;
-		if ( sSavedUrl != null )
-			FCKXHtml._AppendAttribute( node, 'src', sSavedUrl ) ;
+	script : function( node, htmlNode )
+	{
+		// The "TYPE" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'type' ) )
+			FCKXHtml._AppendAttribute( node, 'type', 'text/javascript' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( htmlNode.text ) ) ) ;
+
+		return node ;
+	},
+
+	style : function( node, htmlNode )
+	{
+		// The "TYPE" attribute is required in XHTML.
+		if ( ! node.attributes.getNamedItem( 'type' ) )
+			FCKXHtml._AppendAttribute( node, 'type', 'text/css' ) ;
+
+		var cssText = htmlNode.innerHTML ;
+		if ( FCKBrowserInfo.IsIE )	// Bug #403 : IE always appends a \r\n to the beginning of StyleNode.innerHTML
+			cssText = cssText.replace( /^(\r\n|\n|\r)/, '' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( cssText ) ) ) ;
+
+		return node ;
+	},
+
+	pre : function ( node, htmlNode )
+	{
+		var firstChild = htmlNode.firstChild ;
+
+		if ( firstChild && firstChild.nodeType == 3 )
+			node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' ) ) ) ;
+
+		FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+		return node ;
+	},
+
+	title : function( node, htmlNode )
+	{
+		node.appendChild( FCKXHtml.XML.createTextNode( FCK.EditorDocument.title ) ) ;
 
 		return node ;
@@ -427,27 +418,4 @@
 	},
 
-	pre : function ( node, htmlNode )
-	{
-		var firstChild = htmlNode.firstChild ;
-
-		if ( firstChild && firstChild.nodeType == 3 )
-			node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( '\r\n' ) ) ) ;
-
-		FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
-
-		return node ;
-	},
-
-	script : function( node, htmlNode )
-	{
-		// The "TYPE" attribute is required in XHTML.
-		if ( ! node.attributes.getNamedItem( 'type' ) )
-			FCKXHtml._AppendAttribute( node, 'type', 'text/javascript' ) ;
-
-		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( htmlNode.text ) ) ) ;
-
-		return node ;
-	},
-
 	span : function( node, htmlNode )
 	{
@@ -461,23 +429,27 @@
 	},
 
-	style : function( node, htmlNode )
-	{
-		// The "TYPE" attribute is required in XHTML.
-		if ( ! node.attributes.getNamedItem( 'type' ) )
-			FCKXHtml._AppendAttribute( node, 'type', 'text/css' ) ;
-
-		var cssText = htmlNode.innerHTML ;
-		if ( FCKBrowserInfo.IsIE )	// Bug #403 : IE always appends a \r\n to the beginning of StyleNode.innerHTML
-			cssText = cssText.replace( /^(\r\n|\n|\r)/, '' ) ;
-
-		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( cssText ) ) ) ;
-
-		return node ;
-	},
-
-	title : function( node, htmlNode )
-	{
-		node.appendChild( FCKXHtml.XML.createTextNode( FCK.EditorDocument.title ) ) ;
-
+	// IE loses contents of iframes, and Gecko does give it back HtmlEncoded
+	// Note: Opera does lose the content and doesn't provide it in the innerHTML string
+	iframe : function( node, htmlNode )
+	{
+		var sHtml = htmlNode.innerHTML ;
+
+		// Gecko does give back the encoded html
+		if ( FCKBrowserInfo.IsGecko )
+			sHtml = FCKTools.HTMLDecode( sHtml );
+
+		// Remove the saved urls here as the data won't be processed as nodes
+		sHtml = sHtml.replace( /\s_fcksavedurl="[^"]*"/g, '' ) ;
+
+		node.appendChild( FCKXHtml.XML.createTextNode( FCKXHtml._AppendSpecialItem( sHtml ) ) ) ;
+
+		return node ;
+	},
+
+	body : function( node, htmlNode )
+	{
+		node = FCKXHtml._AppendChildNodes( node, htmlNode, false ) ;
+		// Remove spellchecker attributes added for Firefox when converting to HTML code (Bug #1351).
+		node.removeAttribute( 'spellcheck' ) ;
 		return node ;
 	}
Index: /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml_ie.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml_ie.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/_source/internals/fckxhtml_ie.js	(revision 1183)
@@ -83,83 +83,4 @@
 }
 
-// On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list)
-FCKXHtml.TagProcessors['div'] = function( node, htmlNode )
-{
-	if ( htmlNode.align.length > 0 )
-		FCKXHtml._AppendAttribute( node, 'align', htmlNode.align ) ;
-
-	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
-
-	return node ;
-}
-
-// IE automatically changes <FONT> tags to <FONT size=+0>.
-FCKXHtml.TagProcessors['font'] = function( node, htmlNode )
-{
-	if ( node.attributes.length == 0 )
-		node = FCKXHtml.XML.createDocumentFragment() ;
-
-	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
-
-	return node ;
-}
-
-FCKXHtml.TagProcessors['form'] = function( node, htmlNode )
-{
-	if ( htmlNode.acceptCharset && htmlNode.acceptCharset.length > 0 && htmlNode.acceptCharset != 'UNKNOWN' )
-		FCKXHtml._AppendAttribute( node, 'accept-charset', htmlNode.acceptCharset ) ;
-
-	// IE has a bug and htmlNode.attributes['name'].specified=false if there is
-	// no element with id="name" inside the form (#360 and SF-BUG-1155726).
-	var nameAtt = htmlNode.attributes['name'] ;
-
-	if ( nameAtt && nameAtt.value.length > 0 )
-		FCKXHtml._AppendAttribute( node, 'name', nameAtt.value ) ;
-
-	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
-
-	return node ;
-}
-
-// IE doens't see the value attribute as an attribute for the <INPUT> tag.
-FCKXHtml.TagProcessors['input'] = function( node, htmlNode )
-{
-	if ( htmlNode.name )
-		FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
-
-	if ( htmlNode.value && !node.attributes.getNamedItem( 'value' ) )
-		FCKXHtml._AppendAttribute( node, 'value', htmlNode.value ) ;
-
-	if ( !node.attributes.getNamedItem( 'type' ) )
-		FCKXHtml._AppendAttribute( node, 'type', 'text' ) ;
-
-	return node ;
-}
-
-FCKXHtml.TagProcessors['label'] = function( node, htmlNode )
-{
-	if ( htmlNode.htmlFor.length > 0 )
-		FCKXHtml._AppendAttribute( node, 'for', htmlNode.htmlFor ) ;
-
-	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
-
-	return node ;
-}
-
-// Fix behavior for IE, it doesn't read back the .name on newly created maps 
-FCKXHtml.TagProcessors['map'] = function( node, htmlNode )
-{
-	if ( ! node.attributes.getNamedItem( 'name' ) )
-	{
-		var name = htmlNode.name ;
-		if ( name )
-			FCKXHtml._AppendAttribute( node, 'name', name ) ;
-	}
-
-	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
-
-	return node ;
-}
-
 FCKXHtml.TagProcessors['meta'] = function( node, htmlNode )
 {
@@ -181,4 +102,30 @@
 }
 
+// IE automatically changes <FONT> tags to <FONT size=+0>.
+FCKXHtml.TagProcessors['font'] = function( node, htmlNode )
+{
+	if ( node.attributes.length == 0 )
+		node = FCKXHtml.XML.createDocumentFragment() ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
+
+// IE doens't see the value attribute as an attribute for the <INPUT> tag.
+FCKXHtml.TagProcessors['input'] = function( node, htmlNode )
+{
+	if ( htmlNode.name )
+		FCKXHtml._AppendAttribute( node, 'name', htmlNode.name ) ;
+
+	if ( htmlNode.value && !node.attributes.getNamedItem( 'value' ) )
+		FCKXHtml._AppendAttribute( node, 'value', htmlNode.value ) ;
+
+	if ( !node.attributes.getNamedItem( 'type' ) )
+		FCKXHtml._AppendAttribute( node, 'type', 'text' ) ;
+
+	return node ;
+}
+
 // IE ignores the "SELECTED" attribute so we must add it manually.
 FCKXHtml.TagProcessors['option'] = function( node, htmlNode )
@@ -192,4 +139,51 @@
 }
 
+// IE ignores the "COORDS" and "SHAPE" attribute so we must add it manually.
+FCKXHtml.TagProcessors['area'] = function( node, htmlNode )
+{
+	if ( ! node.attributes.getNamedItem( 'coords' ) )
+	{
+		var sCoords = htmlNode.getAttribute( 'coords', 2 ) ;
+		if ( sCoords && sCoords != '0,0,0' )
+			FCKXHtml._AppendAttribute( node, 'coords', sCoords ) ;
+	}
+
+	if ( ! node.attributes.getNamedItem( 'shape' ) )
+	{
+		var sShape = htmlNode.getAttribute( 'shape', 2 ) ;
+		if ( sShape && sShape.length > 0 )
+			FCKXHtml._AppendAttribute( node, 'shape', sShape.toLowerCase() ) ;
+	}
+
+	return node ;
+}
+
+FCKXHtml.TagProcessors['label'] = function( node, htmlNode )
+{
+	if ( htmlNode.htmlFor.length > 0 )
+		FCKXHtml._AppendAttribute( node, 'for', htmlNode.htmlFor ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode ) ;
+
+	return node ;
+}
+
+FCKXHtml.TagProcessors['form'] = function( node, htmlNode )
+{
+	if ( htmlNode.acceptCharset && htmlNode.acceptCharset.length > 0 && htmlNode.acceptCharset != 'UNKNOWN' )
+		FCKXHtml._AppendAttribute( node, 'accept-charset', htmlNode.acceptCharset ) ;
+
+	// IE has a bug and htmlNode.attributes['name'].specified=false if there is
+	// no element with id="name" inside the form (#360 and SF-BUG-1155726).
+	var nameAtt = htmlNode.attributes['name'] ;
+
+	if ( nameAtt && nameAtt.value.length > 0 )
+		FCKXHtml._AppendAttribute( node, 'name', nameAtt.value ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+	return node ;
+}
+
 // IE doens't hold the name attribute as an attribute for the <TEXTAREA> and <SELECT> tags.
 FCKXHtml.TagProcessors['textarea'] = FCKXHtml.TagProcessors['select'] = function( node, htmlNode )
@@ -202,2 +196,13 @@
 	return node ;
 }
+
+// On very rare cases, IE is loosing the "align" attribute for DIV. (right align and apply bulleted list)
+FCKXHtml.TagProcessors['div'] = function( node, htmlNode )
+{
+	if ( htmlNode.align.length > 0 )
+		FCKXHtml._AppendAttribute( node, 'align', htmlNode.align ) ;
+
+	node = FCKXHtml._AppendChildNodes( node, htmlNode, true ) ;
+
+	return node ;
+}
Index: /FCKeditor/branches/features/floating_dialog/editor/css/fck_editorarea.css
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/css/fck_editorarea.css	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/css/fck_editorarea.css	(revision 1183)
@@ -47,6 +47,5 @@
 a[href]
 {
-	color: -moz-hyperlinktext !important;		/* For Firefox... mark as important, otherwise it becomes black */
-	text-decoration: -moz-anchor-decoration;	/* For Firefox 3, otherwise no underline will be used */
+	color: -moz-hyperlinktext !important;	/* For Firefox... mark as important, otherwise it becomes black */
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_anchor.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_anchor.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_anchor.html	(revision 1183)
@@ -69,5 +69,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
@@ -190,5 +189,5 @@
 		</script>
 	</head>
-	<body style="overflow: hidden">
+	<body style="OVERFLOW: hidden" scroll="no">
 		<table height="100%" width="100%">
 			<tr>
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_button.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_button.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_button.html	(revision 1183)
@@ -56,5 +56,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_checkbox.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_checkbox.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_checkbox.html	(revision 1183)
@@ -54,5 +54,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_form.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_form.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_form.html	(revision 1183)
@@ -54,5 +54,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_hiddenfield.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_hiddenfield.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_hiddenfield.html	(revision 1183)
@@ -60,5 +60,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_listprop.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_listprop.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_listprop.html	(revision 1183)
@@ -67,5 +67,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_radiobutton.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_radiobutton.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_radiobutton.html	(revision 1183)
@@ -54,5 +54,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_replace.html	(revision 1183)
@@ -45,7 +45,4 @@
 	idMap['CheckCase'] = 'chkCase' + tabCode ;
 	idMap['CheckWord'] = 'chkWord' + tabCode ;
-
-	if ( tabCode == 'Replace' )
-		window.parent.SetAutoSize( true ) ;
 }
 
@@ -64,9 +61,6 @@
 
 	// Show the appropriate tab at startup.
-	if ( window.parent.name.search( 'Replace' ) == -1 )
-	{
+	if ( dialogArguments.CustomValue == 'Find' )
 		window.parent.SetSelectedTab( 'Find' ) ;
-		window.parent.SetAutoSize( true ) ;
-	}
 	else
 		window.parent.SetSelectedTab( 'Replace' ) ;
@@ -114,43 +108,21 @@
 function GetData( bookmark )
 {
-	var cursor = oEditor.FCK.EditorDocument.documentElement ;
-	for ( var i = 0 ; i < bookmark.length ; i++ )
-	{
-		var target = bookmark[i] ;
-		var currentIndex = -1 ;
-		if ( cursor.nodeType != 3 )
+	var currentNode = oEditor.FCK.EditorDocument.documentElement;
+	for( var i = 0 ; i < bookmark.length ; i++ )
+	{
+		if ( currentNode.childNodes.length > bookmark[i] )
+			currentNode = currentNode.childNodes.item( bookmark[i] ) ;
+		else if ( currentNode.nodeType == 3 )	// text node
 		{
-			for (var j = 0 ; j < cursor.childNodes.length ; j++ )
-			{
-				var candidate = cursor.childNodes[j] ;
-				if ( candidate.nodeType == 3 &&
-						candidate.previousSibling &&
-						candidate.previousSibling.nodeType == 3 )
-					continue ;
-				currentIndex++ ;
-				if ( currentIndex == target )
-				{
-					cursor = candidate ;
-					break ;
-				}
-			}
-			if ( currentIndex < target )
+			var c = currentNode.nodeValue.charAt( bookmark[i] ) ;
+			if ( i == bookmark.length - 1 )
+				return c != "" ? c : null ;
+			else
 				return null ;
 		}
 		else
-		{
-			if ( i != bookmark.length - 1 )
-				return null ;
-			while ( target >= cursor.length && cursor.nextSibling && cursor.nextSibling.nodeType == 3 )
-			{
-				target -= cursor.length ;
-				cursor = cursor.nextSibling ;
-			}
-			cursor = cursor.nodeValue.charAt( target ) ;
-			if ( cursor == "" )
-				cursor = null ;
-		}
-	}
-	return cursor ;
+			return null;
+	}
+	return currentNode ;
 }
 
@@ -160,4 +132,5 @@
 	// See if there's anything further down the tree.
 	var next = bookmark.concat( [0] ) ;
+
 	if ( GetData( next ) != null )
 		return next ;
@@ -280,8 +253,5 @@
 			{
 				if ( oEditor.FCKListsLib.BlockElements[ data.tagName.toLowerCase() ] )
-				{
 					matcher.Reset();
-					matchBookmark = null ;
-				}
 			}
 			else if ( data.charAt != undefined )
@@ -354,13 +324,6 @@
 		while ( focus && focus.nodeType != 1 )
 			focus = focus.parentNode ;
-
 		if ( focus )
-		{
-			if ( oEditor.FCKBrowserInfo.IsSafari )
-				oEditor.FCKDomTools.ScrollIntoView( focus, false ) ;
-			else
-				focus.scrollIntoView( false ) ;
-		}
-
+		focus.scrollIntoView( false ) ;
 		return true;
 	}
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_select.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_select.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_select.html	(revision 1183)
@@ -72,5 +72,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
@@ -117,5 +116,5 @@
 		</script>
 	</head>
-	<body style="overflow: hidden">
+	<body style='OVERFLOW: hidden' scroll='no'>
 		<table width="100%" height="100%">
 			<tr>
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_smiley.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_smiley.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_smiley.html	(revision 1183)
@@ -42,6 +42,4 @@
 	// First of all, translate the dialog box texts
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
-
-	window.parent.SetAutoSize( true ) ;
 }
 
@@ -75,5 +73,5 @@
 	</script>
 </head>
-<body style="overflow: hidden">
+<body scroll="no">
 	<table cellpadding="2" cellspacing="2" align="center" border="0" width="100%" height="100%">
 		<script type="text/javascript">
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_specialchar.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_specialchar.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_specialchar.html	(revision 1183)
@@ -70,11 +70,9 @@
 	// First of all, translates the dialog box texts.
 	oEditor.FCKLanguageManager.TranslatePage(document) ;
-
-	window.parent.SetAutoSize( true ) ;
 }
 
 		</script>
-	</head>
-	<body onload="setDefaults()" style="overflow: hidden">
+	</HEAD>
+	<BODY onload="setDefaults()" scroll="no">
 		<table cellpadding="0" cellspacing="0" width="100%" height="100%">
 			<tr>
@@ -117,4 +115,4 @@
 			</tr>
 		</table>
-	</body>
-</html>
+	</BODY>
+</HTML>
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_textarea.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_textarea.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_textarea.html	(revision 1183)
@@ -54,5 +54,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
@@ -75,5 +74,5 @@
 		</script>
 	</head>
-	<body style="overflow: hidden">
+	<body style='OVERFLOW: hidden' scroll='no'>
 		<table height="100%" width="100%">
 			<tr>
Index: /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_textfield.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_textfield.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/dialog/fck_textfield.html	(revision 1183)
@@ -58,5 +58,4 @@
 
 	window.parent.SetOkButton( true ) ;
-	window.parent.SetAutoSize( true ) ;
 }
 
Index: /FCKeditor/branches/features/floating_dialog/editor/fckdialog.html
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/fckdialog.html	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/fckdialog.html	(revision 1183)
@@ -40,8 +40,4 @@
 // Sets the language direction.
 window.document.dir = oEditor.FCKLang.Dir ;
-
-// IE does not set the window name in showModalDialog(), let's set it here.
-if ( window.dialogArguments.Editor.FCKBrowserInfo.IsIE )
-	window.name = window.dialogArguments.DialogName ;
 
 var sTitle = window.dialogArguments.Title ;
Index: /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/php/config.php
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/php/config.php	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/filemanager/connectors/php/config.php	(revision 1183)
@@ -26,5 +26,5 @@
 
 // SECURITY: You must explicitly enable this "connector". (Set it to "true").
-// WARNING: don't just set "$Config['Enabled'] = true ;", you must be sure that only 
+// WARNING: don't just set "ConfigIsEnabled = true", you must be sure that only 
 //		authenticated users can access this file or use some kind of session checking.
 $Config['Enabled'] = false ;
Index: /FCKeditor/branches/features/floating_dialog/editor/lang/_translationstatus.txt
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/lang/_translationstatus.txt	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/lang/_translationstatus.txt	(revision 1183)
@@ -23,5 +23,5 @@
 
 af.js      Found: 397   Missing: 15
-ar.js      Found: 412   Missing: 0
+ar.js      Found: 397   Missing: 15
 bg.js      Found: 374   Missing: 38
 bn.js      Found: 381   Missing: 31
@@ -36,6 +36,6 @@
 en-uk.js   Found: 412   Missing: 0
 eo.js      Found: 346   Missing: 66
-es.js      Found: 412   Missing: 0
-et.js      Found: 412   Missing: 0
+es.js      Found: 382   Missing: 30
+et.js      Found: 398   Missing: 14
 eu.js      Found: 382   Missing: 30
 fa.js      Found: 398   Missing: 14
@@ -59,5 +59,5 @@
 nl.js      Found: 412   Missing: 0
 no.js      Found: 396   Missing: 16
-pl.js      Found: 412   Missing: 0
+pl.js      Found: 382   Missing: 30
 pt-br.js   Found: 397   Missing: 15
 pt.js      Found: 382   Missing: 30
@@ -73,4 +73,4 @@
 uk.js      Found: 398   Missing: 14
 vi.js      Found: 397   Missing: 15
-zh-cn.js   Found: 412   Missing: 0
+zh-cn.js   Found: 411   Missing: 1
 zh.js      Found: 412   Missing: 0
Index: /FCKeditor/branches/features/floating_dialog/editor/lang/ar.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/lang/ar.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/lang/ar.js	(revision 1183)
@@ -46,5 +46,5 @@
 RemoveLink			: "إزالة رابط",
 Anchor				: "إدراج/تحرير إشارة مرجعية",
-AnchorDelete		: "إزالة إشارة مرجعية",
+AnchorDelete		: "Remove Anchor",	//MISSING
 InsertImageLbl		: "صورة",
 InsertImage			: "إدراج/تحرير صورة",
@@ -72,5 +72,5 @@
 DecreaseIndent		: "إنقاص المسافة البادئة",
 IncreaseIndent		: "زيادة المسافة البادئة",
-Blockquote			: "اقتباس",
+Blockquote			: "Blockquote",	//MISSING
 Undo				: "تراجع",
 Redo				: "إعادة",
@@ -106,5 +106,5 @@
 
 FitWindow		: "تكبير حجم المحرر",
-ShowBlocks		: "مخطط تفصيلي",
+ShowBlocks		: "Show Blocks",	//MISSING
 
 // Context Menu
@@ -113,18 +113,18 @@
 RowCM				: "صف",
 ColumnCM			: "عمود",
-InsertRowAfter		: "إدراج صف بعد",
-InsertRowBefore		: "إدراج صف قبل",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
 DeleteRows			: "حذف صفوف",
-InsertColumnAfter	: "إدراج عمود بعد",
-InsertColumnBefore	: "إدراج عمود قبل",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
 DeleteColumns		: "حذف أعمدة",
-InsertCellAfter		: "إدراج خلية بعد",
-InsertCellBefore	: "إدراج خلية قبل",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
 DeleteCells			: "حذف خلايا",
 MergeCells			: "دمج خلايا",
-MergeRight			: "دمج لليمين",
-MergeDown			: "دمج للأسفل",
-HorizontalSplitCell	: "تقسيم الخلية أفقياً",
-VerticalSplitCell	: "تقسيم الخلية عمودياً",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
 TableDelete			: "حذف الجدول",
 CellProperties		: "خصائص الخلية",
@@ -333,5 +333,5 @@
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "بحث واستبدال",
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
 
 // Find Dialog
@@ -357,5 +357,5 @@
 
 DlgPasteMsg2	: "الصق داخل الصندوق بإستخدام زرّي (<STRONG>Ctrl+V</STRONG>) في لوحة المفاتيح، ثم اضغط زر  <STRONG>موافق</STRONG>.",
-DlgPasteSec		: "نظراً لإعدادات الأمان الخاصة بمتصفحك، لن يتمكن هذا المحرر من الوصول لمحتوى حافظتك، لذا وجب عليك لصق المحتوى مرة أخرى في هذه النافذة.",
+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
 DlgPasteIgnoreFont		: "تجاهل تعريفات أسماء الخطوط",
 DlgPasteRemoveStyles	: "إزالة تعريفات الأنماط",
Index: /FCKeditor/branches/features/floating_dialog/editor/lang/es.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/lang/es.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/lang/es.js	(revision 1183)
@@ -46,5 +46,5 @@
 RemoveLink			: "Eliminar Vínculo",
 Anchor				: "Referencia",
-AnchorDelete		: "Eliminar Referencia",
+AnchorDelete		: "Remove Anchor",	//MISSING
 InsertImageLbl		: "Imagen",
 InsertImage			: "Insertar/Editar Imagen",
@@ -72,5 +72,5 @@
 DecreaseIndent		: "Disminuir Sangría",
 IncreaseIndent		: "Aumentar Sangría",
-Blockquote			: "Cita",
+Blockquote			: "Blockquote",	//MISSING
 Undo				: "Deshacer",
 Redo				: "Rehacer",
@@ -106,5 +106,5 @@
 
 FitWindow		: "Maximizar el tamaño del editor",
-ShowBlocks		: "Mostrar bloques",
+ShowBlocks		: "Show Blocks",	//MISSING
 
 // Context Menu
@@ -113,18 +113,18 @@
 RowCM				: "Fila",
 ColumnCM			: "Columna",
-InsertRowAfter		: "Insertar fila en la parte inferior",
-InsertRowBefore		: "Insertar fila en la parte superior",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
 DeleteRows			: "Eliminar Filas",
-InsertColumnAfter	: "Insertar columna a la derecha",
-InsertColumnBefore	: "Insertar columna a la izquierda",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
 DeleteColumns		: "Eliminar Columnas",
-InsertCellAfter		: "Insertar celda a la derecha",
-InsertCellBefore	: "Insertar celda a la izquierda",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
 DeleteCells			: "Eliminar Celdas",
 MergeCells			: "Combinar Celdas",
-MergeRight			: "Combinar a la derecha",
-MergeDown			: "Combinar hacia abajo",
-HorizontalSplitCell	: "Dividir la celda horizontalmente",
-VerticalSplitCell	: "Dividir la celda verticalmente",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
 TableDelete			: "Eliminar Tabla",
 CellProperties		: "Propiedades de Celda",
@@ -172,8 +172,8 @@
 DlgGenNotSet		: "<No definido>",
 DlgGenId			: "Id",
-DlgGenLangDir		: "Orientación",
+DlgGenLangDir		: "Orientación de idioma",
 DlgGenLangDirLtr	: "Izquierda a Derecha (LTR)",
 DlgGenLangDirRtl	: "Derecha a Izquierda (RTL)",
-DlgGenLangCode		: "Cód. de idioma",
+DlgGenLangCode		: "Código de idioma",
 DlgGenAccessKey		: "Clave de Acceso",
 DlgGenName			: "Nombre",
@@ -211,5 +211,5 @@
 DlgImgAlignTop		: "Tope",
 DlgImgPreview		: "Vista Previa",
-DlgImgAlertUrl		: "Por favor escriba la URL de la imagen",
+DlgImgAlertUrl		: "Por favor tipee el URL de la imagen",
 DlgImgLinkTab		: "Vínculo",
 
@@ -272,5 +272,5 @@
 DlnLnkMsgNoEMail	: "Por favor tipee la dirección de e-mail",
 DlnLnkMsgNoAnchor	: "Por favor seleccione una referencia",
-DlnLnkMsgInvPopName	: "El nombre debe empezar con un caracter alfanumérico y no debe contener espacios",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
 
 // Color Dialog
@@ -333,5 +333,5 @@
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Buscar y Reemplazar",
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
 
 // Find Dialog
@@ -357,5 +357,5 @@
 
 DlgPasteMsg2	: "Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl+V</STRONG>); luego presione <STRONG>OK</STRONG>.",
-DlgPasteSec		: "Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles. Es necesario que lo pegue de nuevo en esta ventana.",
+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
 DlgPasteIgnoreFont		: "Ignorar definiciones de fuentes",
 DlgPasteRemoveStyles	: "Remover definiciones de estilo",
@@ -394,7 +394,7 @@
 DlgButtonText		: "Texto (Valor)",
 DlgButtonType		: "Tipo",
-DlgButtonTypeBtn	: "Boton",
-DlgButtonTypeSbm	: "Enviar",
-DlgButtonTypeRst	: "Reestablecer",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
 
 // Checkbox and Radio Button Dialogs
@@ -445,5 +445,5 @@
 BulletedListProp	: "Propiedades de Viñetas",
 NumberedListProp	: "Propiedades de Numeraciones",
-DlgLstStart			: "Inicio",
+DlgLstStart			: "Start",	//MISSING
 DlgLstType			: "Tipo",
 DlgLstTypeCircle	: "Círculo",
@@ -468,13 +468,13 @@
 DlgDocLangCode		: "Código de Idioma",
 DlgDocCharSet		: "Codif. de Conjunto de Caracteres",
-DlgDocCharSetCE		: "Centro Europeo",
-DlgDocCharSetCT		: "Chino Tradicional (Big5)",
-DlgDocCharSetCR		: "Cirílico",
-DlgDocCharSetGR		: "Griego",
-DlgDocCharSetJP		: "Japonés",
-DlgDocCharSetKR		: "Coreano",
-DlgDocCharSetTR		: "Turco",
-DlgDocCharSetUN		: "Unicode (UTF-8)",
-DlgDocCharSetWE		: "Europeo occidental",
+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
 DlgDocCharSetOther	: "Otra Codificación",
 
@@ -506,5 +506,5 @@
 DlgTemplatesLoading	: "Cargando lista de Plantillas. Por favor, aguarde...",
 DlgTemplatesNoTpl	: "(No hay plantillas definidas)",
-DlgTemplatesReplace	: "Reemplazar el contenido actual",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
 
 // About Dialog
Index: /FCKeditor/branches/features/floating_dialog/editor/lang/et.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/lang/et.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/lang/et.js	(revision 1183)
@@ -43,14 +43,14 @@
 RemoveFormat		: "Eemalda vorming",
 InsertLinkLbl		: "Link",
-InsertLink			: "Sisesta link / Muuda linki",
+InsertLink			: "Sisesta/Muuda link",
 RemoveLink			: "Eemalda link",
-Anchor				: "Sisesta ankur / Muuda ankrut",
-AnchorDelete		: "Eemalda ankur",
+Anchor				: "Sisesta/Muuda ankur",
+AnchorDelete		: "Remove Anchor",	//MISSING
 InsertImageLbl		: "Pilt",
-InsertImage			: "Sisesta pilt / Muuda pilti",
+InsertImage			: "Sisesta/Muuda pilt",
 InsertFlashLbl		: "Flash",
-InsertFlash			: "Sisesta flash / Muuda flashi",
+InsertFlash			: "Sisesta/Muuda flash",
 InsertTableLbl		: "Tabel",
-InsertTable			: "Sisesta tabel / Muuda tabelit",
+InsertTable			: "Sisesta/Muuda tabel",
 InsertLineLbl		: "Joon",
 InsertLine			: "Sisesta horisontaaljoon",
@@ -60,8 +60,8 @@
 InsertSmiley		: "Sisesta emotikon",
 About				: "FCKeditor teave",
-Bold				: "Paks",
-Italic				: "Kursiiv",
-Underline			: "Allajoonitud",
-StrikeThrough		: "Läbijoonitud",
+Bold				: "Rasvane kiri",
+Italic				: "Kursiiv kiri",
+Underline			: "Allajoonitud kiri",
+StrikeThrough		: "Läbijoonitud kiri",
 Subscript			: "Allindeks",
 Superscript			: "Ülaindeks",
@@ -72,5 +72,5 @@
 DecreaseIndent		: "Vähenda taanet",
 IncreaseIndent		: "Suurenda taanet",
-Blockquote			: "Blokktsitaat",
+Blockquote			: "Blockquote",	//MISSING
 Undo				: "Võta tagasi",
 Redo				: "Korda toimingut",
@@ -93,5 +93,5 @@
 UniversalKeyboard	: "Universaalne klaviatuur",
 PageBreakLbl		: "Lehepiir",
-PageBreak			: "Sisesta lehevahetuskoht",
+PageBreak			: "Sisesta lehevahetus koht",
 
 Form			: "Vorm",
@@ -106,5 +106,5 @@
 
 FitWindow		: "Maksimeeri redaktori mõõtmed",
-ShowBlocks		: "Näita blokke",
+ShowBlocks		: "Show Blocks",	//MISSING
 
 // Context Menu
@@ -113,22 +113,22 @@
 RowCM				: "Rida",
 ColumnCM			: "Veerg",
-InsertRowAfter		: "Sisesta rida peale",
-InsertRowBefore		: "Sisesta rida enne",
-DeleteRows			: "Eemalda read",
-InsertColumnAfter	: "Sisesta veerg peale",
-InsertColumnBefore	: "Sisesta veerg enne",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
+DeleteRows			: "Eemalda ridu",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
 DeleteColumns		: "Eemalda veerud",
-InsertCellAfter		: "Sisesta lahter peale",
-InsertCellBefore	: "Sisesta lahter enne",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
 DeleteCells			: "Eemalda lahtrid",
 MergeCells			: "Ühenda lahtrid",
-MergeRight			: "Ühenda paremale",
-MergeDown			: "Ühenda alla",
-HorizontalSplitCell	: "Poolita lahter horisontaalselt",
-VerticalSplitCell	: "Poolita lahter vertikaalselt",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
 TableDelete			: "Kustuta tabel",
 CellProperties		: "Lahtri atribuudid",
 TableProperties		: "Tabeli atribuudid",
-ImageProperties		: "Pildi atribuudid",
+ImageProperties		: "Pildi  atribuudid",
 FlashProperties		: "Flash omadused",
 
@@ -147,13 +147,13 @@
 
 // Alerts and Messages
-ProcessingXHTML		: "Töötlen XHTML'i. Palun oota...",
+ProcessingXHTML		: "Töötlen XHTML. Palun oota...",
 Done				: "Tehtud",
-PasteWordConfirm	: "Tekst, mida soovid lisada paistab pärinevat Word'ist. Kas soovid seda enne kleepimist puhastada?",
+PasteWordConfirm	: "Tekst, mida soovid lisada paistab pärinevat Wordist. Kas soovid seda enne kleepimist puhastada?",
 NotCompatiblePaste	: "See käsk on saadaval ainult Internet Explorer versioon 5.5 või uuema puhul. Kas soovid kleepida ilma puhastamata?",
-UnknownToolbarItem	: "Tundmatu tööriistarea üksus \"%1\"",
+UnknownToolbarItem	: "Tundmatu tööriistariba üksus \"%1\"",
 UnknownCommand		: "Tundmatu käsunimi \"%1\"",
 NotImplemented		: "Käsku ei täidetud",
 UnknownToolbarSet	: "Tööriistariba \"%1\" ei eksisteeri",
-NoActiveX			: "Sinu veebisirvija turvalisuse seaded võivad limiteerida mõningaid tekstirdaktori kasutusvõimalusi. Sa peaksid võimaldama valiku \"Run ActiveX controls and plug-ins\" oma veebisirvija seadetes. Muidu võid sa täheldada vigu tekstiredaktori töös ja märgata puuduvaid funktsioone.",
+NoActiveX			: "Sinu veebisirvija turvalisuse seaded võivad limiteerida mõningaid tekstirdaktori kasutus võimalusi. Sa peaksid võimaldama valiku \"Run ActiveX controls and plug-ins\" oma sirvija seadetes. Muidu võid sa täheldada vigu tekstiredaktori töös ja märgata puuduvaid funktsioone.",
 BrowseServerBlocked : "Ressursside sirvija avamine ebaõnnestus. Võimalda pop-up akende avanemine.",
 DialogBlocked		: "Ei olenud võimalik avada dialoogi akent. Võimalda pop-up akende avanemine.",
@@ -250,5 +250,5 @@
 DlgLnkTargetPopup	: "<hüpikaken>",
 DlgLnkTargetBlank	: "Uus aken (_blank)",
-DlgLnkTargetParent	: "Esivanem aken (_parent)",
+DlgLnkTargetParent	: "Vanem aken (_parent)",
 DlgLnkTargetSelf	: "Sama aken (_self)",
 DlgLnkTargetTop		: "Pealmine aken (_top)",
@@ -333,5 +333,5 @@
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Otsi ja asenda",
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
 
 // Find Dialog
@@ -360,5 +360,5 @@
 DlgPasteIgnoreFont		: "Ignoreeri kirja definitsioone",
 DlgPasteRemoveStyles	: "Eemalda stiilide definitsioonid",
-DlgPasteCleanBox		: "Puhasta kast",
+DlgPasteCleanBox		: "Puhasta ära kast",
 
 // Color Picker
Index: /FCKeditor/branches/features/floating_dialog/editor/lang/pl.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/lang/pl.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/lang/pl.js	(revision 1183)
@@ -46,5 +46,5 @@
 RemoveLink			: "Usuń hiperłącze",
 Anchor				: "Wstaw/edytuj kotwicę",
-AnchorDelete		: "Usuń kotwicę",
+AnchorDelete		: "Remove Anchor",	//MISSING
 InsertImageLbl		: "Obrazek",
 InsertImage			: "Wstaw/edytuj obrazek",
@@ -72,5 +72,5 @@
 DecreaseIndent		: "Zmniejsz wcięcie",
 IncreaseIndent		: "Zwiększ wcięcie",
-Blockquote			: "Cytat",
+Blockquote			: "Blockquote",	//MISSING
 Undo				: "Cofnij",
 Redo				: "Ponów",
@@ -96,6 +96,6 @@
 
 Form			: "Formularz",
-Checkbox		: "Pole wyboru (checkbox)",
-RadioButton		: "Pole wyboru (radio)",
+Checkbox		: "Checkbox",
+RadioButton		: "Pole wyboru",
 TextField		: "Pole tekstowe",
 Textarea		: "Obszar tekstowy",
@@ -103,8 +103,8 @@
 Button			: "Przycisk",
 SelectionField	: "Lista wyboru",
-ImageButton		: "Przycisk-obrazek",
+ImageButton		: "Przycisk obrazek",
 
 FitWindow		: "Maksymalizuj rozmiar edytora",
-ShowBlocks		: "Pokaż bloki",
+ShowBlocks		: "Show Blocks",	//MISSING
 
 // Context Menu
@@ -113,18 +113,18 @@
 RowCM				: "Wiersz",
 ColumnCM			: "Kolumna",
-InsertRowAfter		: "Wstaw wiersz poniżej",
-InsertRowBefore		: "Wstaw wiersz powyżej",
+InsertRowAfter		: "Insert Row After",	//MISSING
+InsertRowBefore		: "Insert Row Before",	//MISSING
 DeleteRows			: "Usuń wiersze",
-InsertColumnAfter	: "Wstaw kolumnę z prawej",
-InsertColumnBefore	: "Wstaw kolumnę z lewej",
+InsertColumnAfter	: "Insert Column After",	//MISSING
+InsertColumnBefore	: "Insert Column Before",	//MISSING
 DeleteColumns		: "Usuń kolumny",
-InsertCellAfter		: "Wstaw komórkę z prawej",
-InsertCellBefore	: "Wstaw komórkę z lewej",
+InsertCellAfter		: "Insert Cell After",	//MISSING
+InsertCellBefore	: "Insert Cell Before",	//MISSING
 DeleteCells			: "Usuń komórki",
 MergeCells			: "Połącz komórki",
-MergeRight			: "Połącz z komórką z prawej",
-MergeDown			: "Połącz z komórką poniżej",
-HorizontalSplitCell	: "Podziel komórkę poziomo",
-VerticalSplitCell	: "Podziel komórkę pionowo",
+MergeRight			: "Merge Right",	//MISSING
+MergeDown			: "Merge Down",	//MISSING
+HorizontalSplitCell	: "Split Cell Horizontally",	//MISSING
+VerticalSplitCell	: "Split Cell Vertically",	//MISSING
 TableDelete			: "Usuń tabelę",
 CellProperties		: "Właściwości komórki",
@@ -135,7 +135,7 @@
 AnchorProp			: "Właściwości kotwicy",
 ButtonProp			: "Właściwości przycisku",
-CheckboxProp		: "Właściwości pola wyboru (checkbox)",
+CheckboxProp		: "Checkbox - właściwości",
 HiddenFieldProp		: "Właściwości pola ukrytego",
-RadioButtonProp		: "Właściwości pola wyboru (radio)",
+RadioButtonProp		: "Właściwości pola wyboru",
 ImageButtonProp		: "Właściwości przycisku obrazka",
 TextFieldProp		: "Właściwości pola tekstowego",
@@ -156,6 +156,6 @@
 UnknownToolbarSet	: "Pasek narzędzi \"%1\" nie istnieje",
 NoActiveX			: "Ustawienia zabezpieczeń twojej przeglądarki mogą ograniczyć niektóre funkcje edytora. Musisz włączyć opcję \"Uruchamianie formantów Activex i dodatków plugin\". W przeciwnym wypadku mogą pojawiać się błędy.",
-BrowseServerBlocked : "Nie można otworzyć okno menadżera plików. Upewnij się, że wszystkie blokady wyskakujących okienek są wyłączone.",
-DialogBlocked		: "Nie można otworzyć okna dialogowego. Upewnij się, że wszystkie blokady wyskakujących okienek są wyłączone.",
+BrowseServerBlocked : "Okno menadżera plików nie może zostać otwarte. Upewnij się, że wszystkie blokady popup są wyłączone.",
+DialogBlocked		: "Nie można otworzyć okna dialogowego. Upewnij się, że wszystkie blokady popup są wyłączone.",
 
 // Dialogs
@@ -170,5 +170,5 @@
 
 // General Dialogs Labels
-DlgGenNotSet		: "<nie ustawione>",
+DlgGenNotSet		: "<nieustawione>",
 DlgGenId			: "Id",
 DlgGenLangDir		: "Kierunek tekstu",
@@ -179,9 +179,9 @@
 DlgGenName			: "Nazwa",
 DlgGenTabIndex		: "Indeks tabeli",
-DlgGenLongDescr		: "Długi opis hiperłącza",
-DlgGenClass			: "Nazwa klasy CSS",
-DlgGenTitle			: "Opis obiektu docelowego",
-DlgGenContType		: "Typ MIME obiektu docelowego",
-DlgGenLinkCharset	: "Kodowanie znaków obiektu docelowego",
+DlgGenLongDescr		: "Long Description URL",
+DlgGenClass			: "Stylesheet Classes",
+DlgGenTitle			: "Advisory Title",
+DlgGenContType		: "Advisory Content Type",
+DlgGenLinkCharset	: "Linked Resource Charset",
 DlgGenStyle			: "Styl",
 
@@ -189,5 +189,5 @@
 DlgImgTitle			: "Właściwości obrazka",
 DlgImgInfoTab		: "Informacje o obrazku",
-DlgImgBtnUpload		: "Wyślij",
+DlgImgBtnUpload		: "Syślij",
 DlgImgURL			: "Adres URL",
 DlgImgUpload		: "Wyślij",
@@ -212,5 +212,5 @@
 DlgImgPreview		: "Podgląd",
 DlgImgAlertUrl		: "Podaj adres obrazka.",
-DlgImgLinkTab		: "Hiperłącze",
+DlgImgLinkTab		: "Link",
 
 // Flash Dialog
@@ -243,5 +243,5 @@
 DlgLnkEMailSubject	: "Temat",
 DlgLnkEMailBody		: "Treść",
-DlgLnkUpload		: "Wyślij",
+DlgLnkUpload		: "Upload",
 DlgLnkBtnUpload		: "Wyślij",
 
@@ -272,5 +272,5 @@
 DlnLnkMsgNoEMail	: "Podaj adres e-mail",
 DlnLnkMsgNoAnchor	: "Wybierz etykietę",
-DlnLnkMsgInvPopName	: "Nazwa wyskakującego okienka musi zaczynać się od znaku alfanumerycznego i nie może zawierać spacji",
+DlnLnkMsgInvPopName	: "The popup name must begin with an alphabetic character and must not contain spaces",	//MISSING
 
 // Color Dialog
@@ -333,5 +333,5 @@
 
 // Find and Replace Dialog
-DlgFindAndReplaceTitle	: "Znajdź i zamień",
+DlgFindAndReplaceTitle	: "Find and Replace",	//MISSING
 
 // Find Dialog
@@ -357,5 +357,5 @@
 
 DlgPasteMsg2	: "Proszę wkleić w poniższym polu używając klawiaturowego skrótu (<STRONG>Ctrl+V</STRONG>) i kliknąć <STRONG>OK</STRONG>.",
-DlgPasteSec		: "Zabezpieczenia przeglądarki uniemożliwiają wklejenie danych bezpośrednio do edytora. Proszę dane wkleić ponownie w tym okienku.",
+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
 DlgPasteIgnoreFont		: "Ignoruj definicje 'Font Face'",
 DlgPasteRemoveStyles	: "Usuń definicje Stylów",
@@ -381,5 +381,5 @@
 DlgSpellBtnReplace		: "Zmień",
 DlgSpellBtnReplaceAll	: "Zmień wszystkie",
-DlgSpellBtnUndo			: "Cofnij",
+DlgSpellBtnUndo			: "Undo",
 DlgSpellNoSuggestions	: "- Brak sugestii -",
 DlgSpellProgress		: "Trwa sprawdzanie ...",
@@ -394,12 +394,12 @@
 DlgButtonText		: "Tekst (Wartość)",
 DlgButtonType		: "Typ",
-DlgButtonTypeBtn	: "Przycisk",
-DlgButtonTypeSbm	: "Wyślij",
-DlgButtonTypeRst	: "Wyzeruj",
+DlgButtonTypeBtn	: "Button",	//MISSING
+DlgButtonTypeSbm	: "Submit",	//MISSING
+DlgButtonTypeRst	: "Reset",	//MISSING
 
 // Checkbox and Radio Button Dialogs
 DlgCheckboxName		: "Nazwa",
 DlgCheckboxValue	: "Wartość",
-DlgCheckboxSelected	: "Zaznaczone",
+DlgCheckboxSelected	: "Zaznaczony",
 
 // Form Dialog
@@ -445,5 +445,5 @@
 BulletedListProp	: "Właściwości listy punktowanej",
 NumberedListProp	: "Właściwości listy numerowanej",
-DlgLstStart			: "Początek",
+DlgLstStart			: "Start",	//MISSING
 DlgLstType			: "Typ",
 DlgLstTypeCircle	: "Koło",
@@ -468,16 +468,16 @@
 DlgDocLangCode		: "Kod języka",
 DlgDocCharSet		: "Kodowanie znaków",
-DlgDocCharSetCE		: "Środkowoeuropejskie",
-DlgDocCharSetCT		: "Chińskie tradycyjne (Big5)",
-DlgDocCharSetCR		: "Cyrylica",
-DlgDocCharSetGR		: "Greckie",
-DlgDocCharSetJP		: "Japońskie",
-DlgDocCharSetKR		: "Koreańskie",
-DlgDocCharSetTR		: "Tureckie",
-DlgDocCharSetUN		: "Unicode (UTF-8)",
-DlgDocCharSetWE		: "Zachodnioeuropejskie",
+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
 DlgDocCharSetOther	: "Inne kodowanie znaków",
 
-DlgDocDocType		: "Nagłówek typu dokumentu",
+DlgDocDocType		: "Nagłowek typu dokumentu",
 DlgDocDocTypeOther	: "Inny typ dokumentu",
 DlgDocIncXHTML		: "Dołącz deklarację XHTML",
@@ -497,5 +497,5 @@
 DlgDocMeDescr		: "Opis dokumentu",
 DlgDocMeAuthor		: "Autor",
-DlgDocMeCopy		: "Prawa autorskie",
+DlgDocMeCopy		: "Copyright",
 DlgDocPreview		: "Podgląd",
 
@@ -506,5 +506,5 @@
 DlgTemplatesLoading	: "Ładowanie listy szablonów. Proszę czekać...",
 DlgTemplatesNoTpl	: "(Brak zdefiniowanych szablonów)",
-DlgTemplatesReplace	: "Zastąp aktualną zawartość",
+DlgTemplatesReplace	: "Replace actual contents",	//MISSING
 
 // About Dialog
Index: /FCKeditor/branches/features/floating_dialog/editor/lang/zh-cn.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/editor/lang/zh-cn.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/editor/lang/zh-cn.js	(revision 1183)
@@ -357,5 +357,5 @@
 
 DlgPasteMsg2	: "请使用键盘快捷键(<STRONG>Ctrl+V</STRONG>)把内容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>。",
-DlgPasteSec		: "因为你的浏览器的安全设置原因，本编辑器不能直接访问你的剪贴板内容，你需要在本窗口重新粘贴一次。",
+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
 DlgPasteIgnoreFont		: "忽略 Font 标签",
 DlgPasteRemoveStyles	: "清理 CSS 样式",
Index: /FCKeditor/branches/features/floating_dialog/fckconfig.js
===================================================================
--- /FCKeditor/branches/features/floating_dialog/fckconfig.js	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/fckconfig.js	(revision 1183)
@@ -74,4 +74,5 @@
 FCKConfig.FormatIndentator	= '    ' ;
 
+FCKConfig.GeckoUseSPAN	= false ;
 FCKConfig.StartupFocus	= false ;
 FCKConfig.ForcePasteAsPlainText	= false ;
@@ -146,5 +147,5 @@
 FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
 
-FCKConfig.FontFormats	= 'p;h1;h2;h3;h4;h5;h6;pre;address;div' ;
+FCKConfig.FontFormats	= 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ;
 FCKConfig.FontNames		= 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ;
 FCKConfig.FontSizes		= 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large' ;
@@ -264,8 +265,7 @@
 var _QuickUploadLanguage	= 'php' ;	// asp | aspx | cfm | lasso | perl | php | py
 
-// Don't care about the following two lines. It just calculates the correct connector
+// Don't care about the following line. It just calculates the correct connector
 // extension to use for the default File Browser (Perl uses "cgi").
 var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowserLanguage ;
-var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage ;
 
 FCKConfig.LinkBrowser = true ;
@@ -285,15 +285,15 @@
 
 FCKConfig.LinkUpload = true ;
-FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension ;
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
 FCKConfig.LinkUploadAllowedExtensions	= ".(7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip)$" ;			// empty for all
 FCKConfig.LinkUploadDeniedExtensions	= "" ;	// empty for no one
 
 FCKConfig.ImageUpload = true ;
-FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Image' ;
+FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ;
 FCKConfig.ImageUploadAllowedExtensions	= ".(jpg|gif|jpeg|png|bmp)$" ;		// empty for all
 FCKConfig.ImageUploadDeniedExtensions	= "" ;							// empty for no one
 
 FCKConfig.FlashUpload = true ;
-FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadExtension + '?Type=Flash' ;
+FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ;
 FCKConfig.FlashUploadAllowedExtensions	= ".(swf|flv)$" ;		// empty for all
 FCKConfig.FlashUploadDeniedExtensions	= "" ;					// empty for no one
Index: /FCKeditor/branches/features/floating_dialog/fckeditor.cfc
===================================================================
--- /FCKeditor/branches/features/floating_dialog/fckeditor.cfc	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/fckeditor.cfc	(revision 1183)
@@ -189,5 +189,5 @@
 	lConfigKeys = lConfigKeys & ",ProcessHTMLEntities,IncludeLatinEntities,IncludeGreekEntities,ProcessNumericEntities,AdditionalNumericEntities";
 	lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
-	lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
+	lConfigKeys = lConfigKeys & ",GeckoUseSPAN,StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
 	lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
 	lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
Index: /FCKeditor/branches/features/floating_dialog/fckeditor.cfm
===================================================================
--- /FCKeditor/branches/features/floating_dialog/fckeditor.cfm	(revision 1182)
+++ /FCKeditor/branches/features/floating_dialog/fckeditor.cfm	(revision 1183)
@@ -96,5 +96,5 @@
 		lConfigKeys = lConfigKeys & ",ProcessHTMLEntities,IncludeLatinEntities,IncludeGreekEntities,ProcessNumericEntities,AdditionalNumericEntities";
 		lConfigKeys = lConfigKeys & ",FillEmptyBlocks,FormatSource,FormatOutput,FormatIndentator";
-		lConfigKeys = lConfigKeys & ",StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
+		lConfigKeys = lConfigKeys & ",GeckoUseSPAN,StartupFocus,ForcePasteAsPlainText,AutoDetectPasteFromWord,ForceSimpleAmpersand";
 		lConfigKeys = lConfigKeys & ",TabSpaces,ShowBorders,SourcePopup,ToolbarStartExpanded,ToolbarCanCollapse";
 		lConfigKeys = lConfigKeys & ",IgnoreEmptyParagraphValue,PreserveSessionOnFileBrowser,FloatingPanelsZIndex,TemplateReplaceAll,TemplateReplaceCheckbox";
