Ticket #1858: fckjustifycommands.js.patch

editor/_source/commandclasses/fckjustifycommands.js

@@ -1 @@
-/*
+/*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
  * Copyright (C) 2003-2008 Frederico Caldeira Knabben
  *
@@ -88 +88 @@
         {
                 // Save an undo snapshot before doing anything.
                 FCKUndo.SaveUndoStep() ;
-
+                
                 var range = new FCKDomRange( FCK.EditorWindow ) ;
                 range.MoveToSelection() ;
-
+                
                 var currentState = this.GetState() ;
                 if ( currentState == FCK_TRISTATE_DISABLED )
                         return ;
-
-                // Store a bookmark of the selection since the paragraph iterator might
-                // change the DOM tree and break selections.
-                var bookmark = range.CreateBookmark() ;
-
-                var cssClassName = this._CssClassName ;
-
-                // Apply alignment setting for each paragraph.
-                var iterator = new FCKDomRangeIterator( range ) ;
-                var block ;
-                while ( ( block = iterator.GetNextParagraph() ) )
+                
+                if ( FCKBrowserInfo.IsGecko )
                 {
-                        block.removeAttribute( 'align' ) ;
-
-                        if ( cssClassName )
+                        var node = range._Range.startContainer ;
+                        var aCells = [] ;
+                        
+                        while ( node )
                         {
-                                // Remove the any of the alignment classes from the className.
-                                var className = block.className.replace( FCKJustifyCommand._GetClassNameRegex(), '' ) ;
-
-                                // Append the desired class name.
-                                if ( currentState == FCK_TRISTATE_OFF )
+                                if ( node.nodeType == 1 )
                                 {
-                                        if ( className.length > 0 )
-                                                className += ' ' ;
-                                        block.className = className + cssClassName ;
+                                        if ( node.tagName.IEquals(['tr', 'table']) )
+                                        {
+                                                aCells = FCKTableHandler.GetSelectedCells() ;
+                                                break ;
+                                        }
                                 }
-                                else if ( className.length == 0 )
-                                        FCKDomTools.RemoveAttribute( block, 'class' ) ;
+                                
+                                node = node.parentNode ;
                         }
-                        else
-                        {
-                                var style = block.style ;
-                                if ( currentState == FCK_TRISTATE_OFF )
-                                        style.textAlign = this.AlignValue ;
-                                else
+                        
+                        if ( aCells.length > 1 )
+                        { 
+                                for ( var i = 0 ; i < aCells.length ; i++ )
                                 {
-                                        style.textAlign = '' ;
-                                        if ( style.cssText.length == 0 )
-                                                block.removeAttribute( 'style' ) ;
+                                        this._SetAlign( aCells[i], currentState ) ;
                                 }
+                                
+                                FCK.Focus() ;
+                                FCK.Events.FireEvent( 'OnSelectionChange' ) ;
+                            
+                                return ;
                         }
                 }
-
+                
+                // Store a bookmark of the selection since the paragraph iterator might
+                // change the DOM tree and break selections.
+                var bookmark = range.CreateBookmark() ;
+                
+                // Apply alignment setting for each paragraph.
+                var iterator = new FCKDomRangeIterator( range ) ;
+                var block ;
+                while ( ( block = iterator.GetNextParagraph() ) )
+                {
+                        this._SetAlign( block, currentState ) ;
+                }
+                
                 // Restore previous selection.
                 range.MoveToBookmark( bookmark ) ;
                 range.Select() ;
-
+                
                 FCK.Focus() ;
                 FCK.Events.FireEvent( 'OnSelectionChange' ) ;
         },
+        
+        _SetAlign : function( block, currentState )
+        {
+                var cssClassName = this._CssClassName ;
+                
+                block.removeAttribute( 'align' ) ;
+                
+                if ( cssClassName )
+                {
+                        // Remove the any of the alignment classes from the className.
+                        var className = block.className.replace( FCKJustifyCommand._GetClassNameRegex(), '' ) ;
+                        
+                        // Append the desired class name.
+                        if ( currentState == FCK_TRISTATE_OFF )
+                        {
+                                if ( className.length > 0 )
+                                        className += ' ' ;
+                                block.className = className + cssClassName ;
+                        }
+                        else if ( className.length == 0 )
+                                FCKDomTools.RemoveAttribute( block, 'class' ) ;
+                }
+                else
+                {
+                        var style = block.style ;
+                        if ( currentState == FCK_TRISTATE_OFF )
+                        {
+                                style.textAlign = this.AlignValue ;
+                        }
+                        else
+                        {
+                                style.textAlign = '' ;
+                                if ( style.cssText.length == 0 )
+                                        block.removeAttribute( 'style' ) ;
+                        }
+                }
+        },
 
         GetState : function()
         {