Changeset 2276

Timestamp:

2008-07-24 13:36:59 (6 months ago)

Author:

fredck

Message:

Reverted [2236], which has been committed with no review.

Location:

FCKeditor/trunk

Files:

• 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/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

@@ -360 +360 @@
         FCKUndo.SaveUndoStep() ;
 
-        var fakeNodes = false ;
-        var prevCharNodeValue ;
-        if ( FCKBrowserInfo.IsGecko && /^(?: | )+$/.test( html ) )
-        {
-                // Get the previous character's text node value, if any.
-                var selection = FCK.EditorWindow.getSelection() ;
-                var range = selection && selection.rangeCount > 0 && selection.getRangeAt( 0 ) ;
-                var startNode, prevCharNode ;
-                if ( range ) 
-                {
-                        if ( range.startContainer.nodeType == 1 )
-                                startNode = range.startContainer.childNodes[ range.startOffset ] ;
-                        else if ( range.startContainer.nodeType == 3 )
-                                startNode = range.startContainer ;
-                }
-                if ( startNode )
-                {
-                        if ( range.startContainer.nodeType == 1 )
-                        {
-                                var node = startNode.previousSibling ;
-                                while ( node && node.nodeType == 3 && node.length < 1 )
-                                        node = node.previousSibling ;
-                                if ( node && node.nodeType == 3 )
-                                        prevCharNode = node ;
-                        }
-                        else
-                                prevCharNode = startNode ;
-                }
-                if ( prevCharNode )
-                {
-                        prevCharNodeValue = prevCharNode.nodeValue ;
-                        if ( range.startContainer.nodeType == 3 )
-                                prevCharNodeValue = prevCharNodeValue.substr( 0, range.startOffset ) ;
-                }
-
+        if ( FCKBrowserInfo.IsGecko )
+        {
                 // Using the following trick, &nbsp; 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>' ;
-                fakeNodes = true ;
         }
 
@@ -404 +370 @@
         doc.execCommand( 'inserthtml', false, html ) ;
 
-        if ( fakeNodes )
-        {
-                // Retrieve the text node before the newly inserted text node.
-                // Note that this is a different node to the prevCharNode earlier.
-                var firstNode = doc.getElementById( '__fakeFCKRemove1__' ) ;
-                var textNode = firstNode.previousSibling ;
-
+        if ( FCKBrowserInfo.IsGecko )
+        {
                 // Remove the fake nodes.
-                FCKDomTools.RemoveNode( firstNode ) ;
+                FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove1__') ) ;
                 FCKDomTools.RemoveNode( doc.getElementById('__fakeFCKRemove2__') ) ;
-
-                // Restore the previous character's text node value, if any.
-                if ( prevCharNodeValue && textNode && textNode.nodeType == 3 )
-                        textNode.nodeValue = prevCharNodeValue ;
         }
 

FCKeditor/trunk/fckconfig.js

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

FCKeditor/trunk/_whatsnew.html

@@ -47 +47 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/2252">#2252</a>] It's now possible to enable the
                         browsers default menu using the configuration file (FCKConfig.BrowserContextMenu option).</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>
                 <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>