Changeset 425

Timestamp:

2007-07-09 11:44:38 (17 months ago)

Author:

martinkou

Message:

Fixed #137 : FCKConfig.TabSpaces will now work as expected. Also, pressing <Tab> in view source mode will now produce tab spacings instead of changing the focus or doing weired things.

Location:

FCKeditor/trunk/editor/_source

Files:

• classes/fckenterkey.js (modified) (4 diffs)
• internals/fck_ie.js (modified) (1 diff)
• internals/fck.js (modified) (3 diffs)

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

@@ -30 +30 @@
  *                      May be "p", "div", "br". Defaults to "br".
  */
-var FCKEnterKey = function( targetWindow, enterMode, shiftEnterMode )
+var FCKEnterKey = function( targetWindow, enterMode, shiftEnterMode, tabSpaces )
 {
         this.Window                     = targetWindow ;
         this.EnterMode          = enterMode || 'p' ;
         this.ShiftEnterMode     = shiftEnterMode || 'br' ;
+        this.TabText = "\xa0\xa0" ;     // the default text for each tab is two non-breaking spaces
+
+        if ( tabSpaces > 0 )
+        {
+                var a = [] ;
+                for ( var i = 0 ; i < tabSpaces ; i++ )
+                        a.push( "\xa0" ) ;
+                this.TabText = a.join( "" ) ;
+        }
 
         // Setup the Keystroke Handler.
@@ -45 +54 @@
                 [ SHIFT + 13, 'ShiftEnter' ],
                 [ 8                     , 'Backspace' ],
-                [ 46            , 'Delete' ]
+                [ 46            , 'Delete' ],
+                [ 9, "Tab" ]
         ] ) ;
 
@@ -77 +87 @@
                         case 'Delete' :
                                 return oEnterKey.DoDelete() ;
+                                break ;
+                        case "Tab" :
+                                return oEnterKey.DoTab() ;
                 }
         /* @Packager.RemoveLine
@@ -285 +298 @@
         oRange.Release() ;
         return bCustom ;
+}
+
+/*
+ * Executes the <Tab> key behavior.
+ */
+FCKEnterKey.prototype.DoTab = function()
+{
+        var oRange = new FCKDomRange( this.Window );
+        oRange.MoveToSelection() ;
+        oRange.DeleteContents() ;
+        oRange.InsertNode( this.Window.document.createTextNode( this.TabText ) ) ;
+        oRange.Collapse( false ) ;
+        oRange.Select() ;
+        return true ;
 }
 

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

@@ -100 +100 @@
         FCK.ContextMenu._InnerContextMenu.AttachToElement( FCK.EditorDocument.body ) ;
 
-        // Build the "TAB" key replacement (if necessary).
-        if ( FCKConfig.TabSpaces > 0 )
-        {
-                window.FCKTabHTML = '' ;
-                for ( i = 0 ; i < FCKConfig.TabSpaces ; i++ )
-                        window.FCKTabHTML += "&nbsp;" ;
-        }
         this.EditorDocument.attachEvent("onkeydown", FCK._KeyDownListener ) ;
 

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

@@ -716 +716 @@
         // Create the enter key handler
         if ( !FCKConfig.DisableEnterKeyHandler )
-                FCK.EnterKeyHandler = new FCKEnterKey( FCK.EditorWindow, FCKConfig.EnterMode, FCKConfig.ShiftEnterMode ) ;
+                FCK.EnterKeyHandler = new FCKEnterKey( FCK.EditorWindow, FCKConfig.EnterMode, FCKConfig.ShiftEnterMode, FCKConfig.TabSpaces ) ;
 
         // Listen for keystroke events.
@@ -768 +768 @@
                         return false ;
                 }
+                else if ( keystrokeValue == 'CustomTab' )
+                        return false ;          // ignore it here, it's handled in fckenterkey.js
         }
         else
@@ -774 +776 @@
                 if ( keystrokeValue.Equals( 'Paste', 'Undo', 'Redo', 'SelectAll' ) )
                         return false ;
+                // Pressing <Tab> in source mode should produce a tab space in the text area, not
+                // changing the focus to something else.
+                if ( keystrokeValue == 'CustomTab' )
+                {
+                        if ( FCKBrowserInfo.IsIE )
+                        {
+                                var range = document.selection.createRange() ;
+                                if ( range.parentElement() != FCK.EditingArea.Textarea ) 
+                                        return false ;
+                                range.text = "\t" ;
+                                range.select() ;
+                        }
+                        else
+                        {
+                                var a = [] ;
+                                var el = FCK.EditingArea.Textarea ;
+                                var selStart = el.selectionStart ;
+                                var selEnd = el.selectionEnd ;
+                                a.push( el.value.substr(0, selStart ) ) ;
+                                a.push( "\t" ) ;
+                                a.push( el.value.substr( selEnd ) ) ;
+                                el.value = a.join( "" ) ;
+                                el.setSelectionRange( selStart + 1, selStart + 1 ) ;
+                        }
+                        return true ;
+                }
         }