Changeset 480

Timestamp:

2007-07-20 02:09:43 (17 months ago)

Author:

martinkou

Message:

Fixed #125 : Implemented click-and-drag table column resizing as a the 'dragresizetable' plugin.

Location:

FCKeditor/trunk

Files:

• editor/plugins/dragresizetable (added)
• editor/plugins/dragresizetable/fckplugin.js (added)
• editor/_source/classes/fckspecialcombo.js (modified) (1 diff)
• editor/_source/commandclasses/fck_othercommands.js (modified) (1 diff)
• editor/_source/internals/fck_gecko.js (modified) (3 diffs)
• editor/_source/internals/fck_ie.js (modified) (2 diffs)
• editor/_source/internals/fckselection_gecko.js (modified) (1 diff)
• editor/_source/internals/fckselection_ie.js (modified) (3 diffs)
• editor/_source/internals/fckselection.js (modified) (1 diff)
• editor/_source/internals/fcktablehandler.js (modified) (12 diffs)
• editor/_source/internals/fcktools.js (modified) (1 diff)
• fckconfig.js (modified) (1 diff)

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

@@ -139 +139 @@
         for ( var i in this.Items )
         {
+                if ( !this.Items[i] ) continue;
                 this.Items[i].className = this.Items[i].originalClass = 'SC_Item' ;
                 this.Items[i].Selected = false ;

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

@@ -99 +99 @@
         if ( typeof( fontSize ) == 'string' ) fontSize = parseInt(fontSize, 10) ;
 
-        if ( fontSize == null || fontSize == '' )
-        {
-                // TODO: Remove font size attribute (Now it works with size 3. Will it work forever?)
-                FCK.ExecuteNamedCommand( 'FontSize', 3 ) ;
+        // If user wants the font size cleared, we have to find
+        // where the font size tag is and go clear it (if there's one)
+        if ( !fontSize || fontSize == null || fontSize == '' )
+        {
+                var oFont = FCK.Selection.MoveToAncestorNode('FONT');
+                if ( oFont && oFont.getAttribute("size") )
+                {
+                        //if the only thing here is SIZE, collapse the whole tag
+                        if (oFont.attributes.length == 1 ||
+                                (oFont.outerHTML && oFont.outerHTML.search(/<FONT size=["]*\d["]*>/i)))
+                        {
+                                FCKTools.RemoveOuterTags(oFont);
+                        }
+                        else
+                                oFont.removeAttribute("size");
+                }       
+
         }
         else

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

@@ -39 +39 @@
         }
 
+        //allow the table handler to handle mouse messages for dynamic table sizing
+        this._ExecMouseDown = function(e)
+        {
+                FCK.Events.FireEvent( "OnMouseDown",e ) ;
+        }
+
+        this._ExecMouseMove = function(e)
+        {
+                FCK.Events.FireEvent( "OnMouseMove",e ) ;
+        }
+
+        this._ExecMouseUp = function(e)
+        {
+                FCK.Events.FireEvent( "OnMouseUp",e ) ;
+        }
         this.ExecOnSelectionChangeTimer = function()
         {
@@ -62 +77 @@
         // Record changes for the undo system when there are key down events.
         this.EditorDocument.addEventListener( 'keydown', this._KeyDownListener, false ) ;
+
+        
+        //Hooks for table sizing
+        this.EditorDocument.addEventListener( 'mousedown', this._ExecMouseDown, true ) ;
+        this.EditorDocument.addEventListener( 'mouseup', this._ExecMouseUp, true ) ;
+        this.EditorDocument.addEventListener( 'mousemove', this._ExecMouseMove, true ) ;
 
         // Reset the context menu.
@@ -99 +120 @@
         Print   : true,
         Paste   : true,
+
         Cut     : true,
         Copy    : true

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

@@ -70 +70 @@
                 FCK.EditorWindow.event.returnValue      = false ;
         }
+        FCK.Events.FireEvent( "OnMouseUp",FCK.EditorWindow.event) ;
+}
+
+function Doc_OnMouseDown()
+{
+        FCK.Events.FireEvent( "OnMouseDown",FCK.EditorWindow.event ) ;
+}
+
+function Doc_OnMouseMove()
+{
+        FCK.Events.FireEvent( "OnMouseMove",FCK.EditorWindow.event) ;
 }
 
@@ -103 +114 @@
 
         this.EditorDocument.attachEvent("ondblclick", Doc_OnDblClick ) ;
+        
+        //additions for table sizing
+        this.EditorDocument.attachEvent( 'onmousedown', Doc_OnMouseDown ) ;
+        this.EditorDocument.attachEvent( 'onmousemove', Doc_OnMouseMove ) ;
 
         // Catch cursor selection changes.

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

@@ -150 +150 @@
         return oSel ;
 }
+
+// If FCKSelection is inside a table, return <td>'s so we can work on each
+// one as a separate element
+FCKSelection.TableNodes = function()
+{
+        var oSel = FCK.EditorWindow.getSelection();
+        var aNodes = new Array();
+        if (this.HasAncestorNode("TABLE"))
+        {
+                var oTable = this.MoveToAncestorNode("TABLE");
+                for (var r = 0; r < oTable.rows.length; r++)
+                {
+                        for (var c = 0; c < oTable.rows[r].cells.length; c++)
+                        {
+                                if (oSel.containsNode(oTable.rows[r].cells[c],true))
+                                {
+                                        aNodes[aNodes.length] = oTable.rows[r].cells[c];
+                                }
+                        }
+                }
+        }
+        return aNodes;
+}
+
+FCKSelection.SelectedHTML = function()
+{
+        var oSel = FCK.EditorWindow.getSelection();
+        var strHTML = "";
+        //convert to a text range and walk the elements
+        for ( var i = 0 ; i < oSel.rangeCount ; i++ )
+        {
+                var df = oSel.getRangeAt(i).cloneContents();
+                
+                for (var j = 0; j < df.childNodes.length; j++)
+                {
+                        if (df.childNodes[j].nodeName == "#text")
+                                {if (df.childNodes[j].textContent) strHTML += df.childNodes[j].textContent;}
+                        else
+                                strHTML += '<' + df.childNodes[j].nodeName + '>'
+                                                + df.childNodes[j].innerHTML
+                                                + '</' + df.childNodes[j].nodeName + '>';
+                }
+        }
+        return strHTML;
+}
+

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

@@ -47 +47 @@
         {
                 case 'Control' :
+                        if (!FCKSelection.GetSelectedElement()) return;
                         return FCKSelection.GetSelectedElement().parentElement ;
                 case 'None' :
@@ -110 +111 @@
         return false ;
 } ;
+// If FCKSelection is inside a table, return <td>'s so we can work on each
+// one as a separate element
+FCKSelection.TableNodes = function()
+{
+        var oRange = FCK.EditorDocument.selection.createRange() ;
+        if (!oRange.htmlText.search(/<TD /)) return;
+        var oCellRange = oRange.duplicate();
+        var oTable = this.MoveToAncestorNode("TABLE");
+        if (!oTable) return;
+        var aNodes = new Array();
+        for (var i = 0; i < oTable.cells.length; i++)
+        {
+                oCellRange.moveToElementText(oTable.cells[i]);
+                if (oRange.inRange(oCellRange))
+                {
+                        aNodes[aNodes.length] = oTable.cells[i];
+                }
+        }
+        return aNodes;
+}
+
 
 // The "nodeTagName" parameter must be UPPER CASE.
@@ -157 +179 @@
 } ;
 
+FCKSelection.SelectedHTML = function()
+{
+        return FCK.EditorDocument.selection.createRange().htmlText;
+}
 

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

@@ -23 +23 @@
 
 var FCKSelection = FCK.Selection = new Object() ;
+

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

@@ -1 +1 @@
 /*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    http://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    http://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Manage table operations.
- */
+       * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+       * Copyright (C) 2003-2007 Frederico Caldeira Knabben
+       *
+       * == BEGIN LICENSE ==
+       *
+       * Licensed under the terms of any of the following licenses at your
+       * choice:
+       *
+       *  - GNU General Public License Version 2 or later (the "GPL")
+       *    http://www.gnu.org/licenses/gpl.html
+       *
+       *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+       *    http://www.gnu.org/licenses/lgpl.html
+       *
+       *  - Mozilla Public License Version 1.1 or later (the "MPL")
+       *    http://www.mozilla.org/MPL/MPL-1.1.html
+       *
+       * == END LICENSE ==
+       *
+       * Manage table operations.
+       */
 
 var FCKTableHandler = new Object() ;
@@ -42 +42 @@
 FCKTableHandler.DeleteRows = function( row )
 {
-        // If no row has been passed as a parameter,
-        // then get the row where the selection is placed in.
-        if ( !row )
-                row = FCKSelection.MoveToAncestorNode( 'TR' ) ;
-        if ( !row ) return ;
+        // If no row has been passed as a parameer,
+        // then get the row( s ) containing the cells where the selection is placed in. 
+        // If user selected multiple rows ( by selecting multiple cells ), walk
+        // the selected cell list and delete the rows containing the selected cells
+        if ( ! row )
+        {
+                var aCells = FCKTableHandler.GetSelectedCells() ;
+                var aRowsToDelete = new Array() ;
+                //queue up the rows -- it's possible ( and likely ) that we may get duplicates
+                for ( var i = 0; i < aCells.length; i++ )
+                {
+                        var oRow = FCKTools.GetElementAscensor( aCells[i],'TR' ) ;
+                        aRowsToDelete[oRow.rowIndex] = oRow ;
+                }
+                for ( var i = aRowsToDelete.length; i >= 0; i-- )
+                {
+                        if ( aRowsToDelete[i] )
+                                FCKTableHandler.DeleteRows( aRowsToDelete[i] );
+                }
+                return ;
+        }
 
         // Get the row's table.
@@ -77 +93 @@
         FCKSelection.SelectNode( table ) ;
         FCKSelection.Collapse();
-        table.parentNode.removeChild( table ) ;
+
+        // if the table is wrapped with a singleton <p> ( or something similar ), remove
+        // the surrounding tag -- which likely won't show after deletion anyway
+        if ( table.parentNode.childNodes.length == 1 )
+                table.parentNode.parentNode.removeChild( table.parentNode );
+        else
+                table.parentNode.removeChild( table  ) ;
 }
 
@@ -83 +105 @@
 {
         // Get the cell where the selection is placed in.
-        var oCell = FCKSelection.MoveToAncestorNode('TD') || FCKSelection.MoveToAncestorNode('TH') ;
-
-        if ( !oCell ) 
-        {
-                // oCell not fouund could be due to multiple selection ranges on tables in Gecko.
-                // We have another function to find the table cell for this special case.
-                if ( ! FCKBrowserInfo.IsIE )
-                {
-                        var node = this._GetSelectedCellFromGecko( true ) ;
-                        if ( node )
-                                oCell = node ;
-                        else
-                                return null ;
-                }
-                else
-                        return null ;
-        }
+        var oCell = null ;
+        var nodes = this.GetSelectedCells() ;
+        if ( nodes && nodes.length )
+                oCell = nodes[ insertBefore ? 0 : ( nodes.length - 1 ) ] ;
+        if ( ! oCell )
+                return null ;
 
         // Get the cell's table.
@@ -133 +144 @@
 }
 
-FCKTableHandler.DeleteColumns = function()
-{
-        // Get the cell where the selection is placed in.
-        var oCell = FCKSelection.MoveToAncestorNode('TD') || FCKSelection.MoveToAncestorNode('TH') ;
+FCKTableHandler.DeleteColumns = function( oCell )
+{
+        // if user selected multiple cols ( by selecting multiple cells ), walk
+        // the selected cell list and delete the rows containing the selected cells
+        if ( !oCell  )
+        {
+                var aColsToDelete = FCKTableHandler.GetSelectedCells();
+                for ( var i = aColsToDelete.length; i >= 0; i--  )
+                {
+                        if ( aColsToDelete[i]  )
+                                FCKTableHandler.DeleteColumns( aColsToDelete[i]  );
+                }
+                return;
+        }
 
         if ( !oCell ) return ;
@@ -170 +191 @@
 {
         // Get the cell where the selection is placed in.
-        var oCell = cell ? cell : FCKSelection.MoveToAncestorNode( 'TD' ) ;
-        if ( !oCell ) 
-        {
-                // oCell not fouund could be due to multiple selection ranges on tables in Gecko.
-                // We have another function to find the table cell for this special case.
-                if ( ! FCKBrowserInfo.IsIE )
-                {
-                        var node = this._GetSelectedCellFromGecko( true ) ;
-                        if ( node )
-                                oCell = node ;
-                        else
-                                return null ;
-                }
-                else
-                        return null ;
-        }
+        var oCell = null ;
+        var nodes = this.GetSelectedCells() ;
+        if ( nodes && nodes.length )
+                oCell = nodes[ insertBefore ? 0 : ( nodes.length - 1 ) ] ;
+        if ( ! oCell )
+                return null ;
 
         // Create the new cell element to be added.
@@ -191 +202 @@
         if ( FCKBrowserInfo.IsGecko )
                 oNewCell.innerHTML = GECKO_BOGUS ;
-//      oNewCell.innerHTML = "&nbsp;" ;
+        //      oNewCell.innerHTML = "&nbsp;" ;
 
         if ( !insertBefore && oCell.cellIndex == oCell.parentNode.cells.length - 1 )
@@ -256 +267 @@
                                 continue ;
 
-                                oCellsContents.insertBefore( eChild, oCellsContents.firstChild ) ;
+                        oCellsContents.insertBefore( eChild, oCellsContents.firstChild ) ;
                 }
 
@@ -288 +299 @@
         var iCellIndex = FCKTableHandler._GetCellIndexSpan( aMap, aCells[0].parentNode.rowIndex , aCells[0] ) ;
 
-        var aCollCells = this._GetCollumnCells( aMap, iCellIndex ) ;
+        var aCollCells = this._GetColumnCells( aMap, iCellIndex ) ;
 
         for ( var i = 0 ; i < aCollCells.length ; i++ )
@@ -325 +336 @@
 }
 
-// Get the cells available in a collumn of a TableMap.
-FCKTableHandler._GetCollumnCells = function( tableMap, collumnIndex )
+// Get the cell location from a TableMap. Returns an array with an [x,y] location
+FCKTableHandler._GetCellLocation = function( tableMap, cell  )
+{
+        for ( var i = 0 ; i < tableMap.length; i++ )
+        {
+                for ( var c = 0 ; c < tableMap[i].length ; c++  )
+                {
+                        if ( tableMap[i][c] == cell  ) return [i,c];
+                }
+        }
+        return null ;
+}
+
+// Get the cells available in a column of a TableMap.
+FCKTableHandler._GetColumnCells = function( tableMap, columnIndex )
 {
         var aCollCells = new Array() ;
@@ -332 +356 @@
         for ( var r = 0 ; r < tableMap.length ; r++ )
         {
-                var oCell = tableMap[r][collumnIndex] ;
+                var oCell = tableMap[r][columnIndex] ;
                 if ( oCell && ( aCollCells.length == 0 || aCollCells[ aCollCells.length - 1 ] != oCell ) )
                         aCollCells[ aCollCells.length ] = oCell ;
@@ -405 +429 @@
         }
 }
-
-FCKTableHandler._GetSelectedCellFromGecko = function( getLastCell )
-{
-        var sel = FCK.EditorWindow.getSelection() ;
-        if ( sel.rangeCount < 1 )
-                return null ;
-        var range = getLastCell ? sel.getRangeAt( sel.rangeCount - 1 ) : sel.getRangeAt( 0 ) ;
-        var node = getLastCell ? range.endContainer : range.startContainer ;
-
-        // Gecko returns a <TR> as startContainer and endContainer when cells are selected.
-        // We need to find back the final <TD|TH> that's being selected.
-        if ( node.nodeType == 1 && node.tagName.toLowerCase() == 'tr' )
-        {
-                for ( var i = range.startOffset ; i <= range.endOffset ; i++ )
-                {
-                        var candidate = node.childNodes[i] ;
-                        var tag = candidate.tagName.toLowerCase() ;
-                        if ( candidate.nodeType == 1 && ( tag == 'td' || tag == 'th' ) )
-                        {
-                                node = node.childNodes[i] ;
-                                break ;
-                        }
-                }
-        }
-        // For safety, we have to be ready for the 'usual' case as well.
-        else
-        {
-                while ( node && node.tagName.toLowerCase() != 'td' && node.tagName.toLowerCase() != 'th' )
-                        node = node.parentNode ;
-        }
-
-        // Have we found the <TD|TH> node we wanted, finally? If yes, return the found node. If not, abort.
-        if ( node.tagName.toLowerCase() != 'td' && node.tagName.toLowerCase() != 'th' )
-                return null ;
-        else
-                return node ;
-}

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

@@ -94 +94 @@
                 return '' ;
 
-        text = text.replace( /&/g, '&' ) ;
-        text = text.replace( /</g, '&lt;' ) ;
-        text = text.replace( />/g, '&gt;' ) ;
-
-        return text ;
 }
 

FCKeditor/trunk/fckconfig.js

@@ -49 +49 @@
 
 // FCKConfig.Plugins.Add( 'autogrow' ) ;
+// FCKConfig.Plugins.Add( 'dragresizetable' );
 FCKConfig.AutoGrowMax = 400 ;