Ticket #2248: 2248.patch

_whatsnew.html

@@ -106 +106 @@
                         are applied in the image preview dialog.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2056">#2056</a>] Fixed several validation
                         errors in the dialogs.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2248">#2248</a>] Calling FCK.InsertHtml( 'nbsp;') was inserting a plain space instead of a non breaking space
+                        character.</li>
         </ul>
         <h3>
                 Version 2.6</h3>

editor/_source/internals/fck_gecko.js

@@ -349 +349 @@
 // selected content if any.
 FCK.InsertHtml = function( html )
 {
+        var doc = FCK.EditorDocument ;
+
         html = FCKConfig.ProtectedSource.Protect( html ) ;
         html = FCK.ProtectEvents( html ) ;
         html = FCK.ProtectUrls( html ) ;
@@ -357 +359 @@
         // Save an undo snapshot first.
         FCKUndo.SaveUndoStep() ;
 
+        if ( FCKBrowserInfo.IsGecko )
+        {
+                // Using the following trick,   present at the beginning and at
+                // the end of the HTML are preserved (#2248).
+                html = '<span id="__fakeFCKRemove1__" style="display:none;">fakeFCKRemove</span>' + html + '<span id="__fakeFCKRemove2__" style="display:none;">fakeFCKRemove</span>' ;
+        }
+
         // Insert the HTML code.
-        this.EditorDocument.execCommand( 'inserthtml', false, html ) ;
+        doc.execCommand( 'inserthtml', false, html ) ;
+
+        if ( FCKBrowserInfo.IsGecko )
+        {
+                // Remove the fake nodes.
+                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove1__') ) ;
+                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove2__') ) ;
+        }
+
         this.Focus() ;
 
         // Save the caret position before calling document processor.
@@ -366 +383 @@
         range.MoveToSelection() ;
         var bookmark = range.CreateBookmark() ;
 
-        FCKDocumentProcessor.Process( FCK.EditorDocument ) ;
+        FCKDocumentProcessor.Process( doc ) ;
 
         // Restore caret position, ignore any errors in case the document
         // processor removed the bookmark <span>s for some reason.