Changeset 2279 for FCKeditor/trunk

Timestamp:

2008-07-25 07:31:08 (4 months ago)

Author:

fredck

Message:

Fixed #2247 : The SHIFT+SPACE keystroke will now produce a   character.

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckdocumentfragment_gecko.js (modified) (1 diff)
• editor/_source/commandclasses/fck_othercommands.js (modified) (1 diff)
• editor/_source/internals/fckcommands.js (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (2 diffs)
• fckconfig.js (modified) (1 diff)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckdocumentfragment_gecko.js

@@ -41 +41 @@
         },
 
+        AppendHtml : function( html )
+        {
+                var eTmpDiv = this.RootNode.ownerDocument.createElement( 'div' ) ;
+                eTmpDiv.innerHTML = html ;
+                FCKDomTools.MoveChildren( eTmpDiv, this.RootNode ) ;
+        },
+
         InsertAfterNode : function( existingNode )
         {

FCKeditor/trunk/editor/_source/commandclasses/fck_othercommands.js

@@ -614 +614 @@
         }
 } ;
+
+// FCKRuleCommand
+var FCKNbsp = function()
+{
+        this.Name = 'Non Breaking Space' ;
+}
+
+FCKNbsp.prototype =
+{
+        Execute : function()
+        {
+                FCK.InsertHtml( ' ' ) ;
+        },
+
+        GetState : function()
+        {
+                return ( FCK.EditMode != FCK_EDITMODE_WYSIWYG ? FCK_TRISTATE_DISABLED : FCK_TRISTATE_OFF ) ;
+        }
+} ;

FCKeditor/trunk/editor/_source/internals/fckcommands.js

@@ -81 +81 @@
                 case 'PageBreak'        : oCommand = new FCKPageBreakCommand() ; break ;
                 case 'Rule'                     : oCommand = new FCKRuleCommand() ; break ;
+                case 'Nbsp'                     : oCommand = new FCKNbsp() ; break ;
 
                 case 'TextColor'        : oCommand = new FCKTextColorCommand('ForeColor') ; break ;

FCKeditor/trunk/editor/_source/internals/fck_gecko.js

@@ -350 +350 @@
 FCK.InsertHtml = function( html )
 {
-        var doc = FCK.EditorDocument ;
+        var doc = FCK.EditorDocument,
+                range;
 
         html = FCKConfig.ProtectedSource.Protect( html ) ;
@@ -362 +363 @@
         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.
-        doc.execCommand( 'inserthtml', false, html ) ;
-
-        if ( FCKBrowserInfo.IsGecko )
-        {
-                // Remove the fake nodes.
-                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove1__') ) ;
-                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove2__') ) ;
-        }
+                html = html.replace( /&nbsp;$/, '$&<span _fcktemp="1"/>' ) ;
+
+                var docFrag = new FCKDocumentFragment( this.EditorDocument ) ;
+                docFrag.AppendHtml( html ) ;
+
+                var lastNode = docFrag.RootNode.lastChild ;
+
+                range = new FCKDomRange( this.EditorWindow ) ;
+                range.MoveToSelection() ;
+                range.InsertNode( docFrag.RootNode ) ;
+
+                range.MoveToPosition( lastNode, 4 ) ;
+        }
+        else
+                doc.execCommand( 'inserthtml', false, html ) ;
 
         this.Focus() ;
 
         // Save the caret position before calling document processor.
-        var range = new FCKDomRange( this.EditorWindow ) ;
-        range.MoveToSelection() ;
+        if ( !range )
+        {
+                range = new FCKDomRange( this.EditorWindow ) ;
+                range.MoveToSelection() ;
+        }
         var bookmark = range.CreateBookmark() ;
 

FCKeditor/trunk/fckconfig.js

@@ -143 +143 @@
         [ CTRL + 85 /*U*/, 'Underline' ],
         [ CTRL + SHIFT + 83 /*S*/, 'Save' ],
-        [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ]
+        [ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ],
+        [ SHIFT + 32 /*SPACE*/, 'Nbsp' ]
 ] ;
 

FCKeditor/trunk/_whatsnew.html

@@ -49 +49 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2032">#2032</a>] Added HTML samples
                         for legacy HTML and Flash-embedded HTML code.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2247">#2247</a>] The SHIFT+SPACE
+                        keystroke will now produce a &amp;nbsp; character.</li>
         </ul>
         <p>