Changeset 2070
- Timestamp:
- 2008-06-13 09:25:00 (5 months ago)
- Location:
- FCKeditor/trunk
- Files:
-
- 2 modified
-
editor/_source/internals/fck_gecko.js (modified) (3 diffs)
-
_whatsnew.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
FCKeditor/trunk/editor/_source/internals/fck_gecko.js
r2054 r2070 350 350 FCK.InsertHtml = function( html ) 351 351 { 352 var doc = FCK.EditorDocument ; 353 352 354 html = FCKConfig.ProtectedSource.Protect( html ) ; 353 355 html = FCK.ProtectEvents( html ) ; … … 358 360 FCKUndo.SaveUndoStep() ; 359 361 362 if ( FCKBrowserInfo.IsGecko ) 363 { 364 // Using the following trick, present at the beginning and at 365 // the end of the HTML are preserved (#2248). 366 html = '<span id="__fakeFCKRemove1__" style="display:none;">fakeFCKRemove</span>' + html + '<span id="__fakeFCKRemove2__" style="display:none;">fakeFCKRemove</span>' ; 367 } 368 360 369 // Insert the HTML code. 361 this.EditorDocument.execCommand( 'inserthtml', false, html ) ; 370 doc.execCommand( 'inserthtml', false, html ) ; 371 372 if ( FCKBrowserInfo.IsGecko ) 373 { 374 // Remove the fake nodes. 375 FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove1__') ) ; 376 FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove2__') ) ; 377 } 378 362 379 this.Focus() ; 363 380 … … 367 384 var bookmark = range.CreateBookmark() ; 368 385 369 FCKDocumentProcessor.Process( FCK.EditorDocument) ;386 FCKDocumentProcessor.Process( doc ) ; 370 387 371 388 // Restore caret position, ignore any errors in case the document -
FCKeditor/trunk/_whatsnew.html
r2069 r2070 45 45 Fixed Bugs:</p> 46 46 <ul> 47 <li></li> 47 <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 48 character.</li> 48 49 </ul> 49 50 <p>