Changeset 441

Timestamp:

07/12/07 17:18:48 (6 years ago)

Author:

martinkou

Message:

Removed mjk's table drag resize code from core.
Created dragresizetable plugin.
Added resize cell finding logic to dragresizetableplugin.

Location:

FCKeditor/branches/developers/martinkou

Files:

• editor/_source/classes/fckspecialcombo.js (modified) (1 diff)
• editor/_source/internals/fckselection.js (modified) (1 diff)
• editor/_source/internals/fcktablehandler.js (modified) (1 diff)
• editor/_source/internals/fcktools.js (modified) (1 diff)
• editor/plugins/dragresizetable (added)
• editor/plugins/dragresizetable/fckplugin.js (added)
• fckconfig.js (modified) (1 diff)

FCKeditor/branches/developers/martinkou/editor/_source/classes/fckspecialcombo.js

@@ -177 +177 @@
 
         this._OuterTable.className = isEnabled ? '' : 'SC_FieldDisabled' ;
-}
-
-FCKSpecialCombo.prototype.ClearItems = function ()
-{
-        if ( this.Items )
-        {
-                for ( var key in this.Items )
-                        this.Items[key] = null ;
-        }
-        while (this._ItemsHolderEl.firstChild)
-                this._ItemsHolderEl.removeChild(this._ItemsHolderEl.firstChild);
 }
 

FCKeditor/branches/developers/martinkou/editor/_source/internals/fckselection.js

@@ -24 +24 @@
 var FCKSelection = FCK.Selection = new Object() ;
 
-//Return the nearest ancestor to the current position of the caret.
-FCKSelection.GetCaretAncestor = function(strTag)
-{
-        var e = FCKSelection.GetParentElement();
-        var tn = e ?    FCKTools.GetElementAscensor(e,strTag) :
-                                        FCKSelection.MoveToAncestorNode(strTag);
-        return tn;
-}
-
-FCKSelection.SelectedText = function()
-{
-        return FCKTools.HTMLToText( this.SelectedHTML() );
-}

FCKeditor/branches/developers/martinkou/editor/_source/internals/fcktablehandler.js

@@ -415 +415 @@
 }
 
-//Returns TRUE if any cell has width set
-FCKTableHandler.HasCellWidths = function( table )
-{
-        for ( var r = 0; r < table.rows.length; r++ )
-        {
-                for ( var c = 0; c < table.rows[r].cells.length; c++ )
-                {
-                        if ( table.rows[r].cells[c].width ) return true;
-                }
-        }
-        return false;
-}
-
-//Clears all cell widths/heights ( letting the browser size everything )
-FCKTableHandler.ClearCellWidths = function( table )
-{
-        for ( var r = 0; r < table.rows.length; r++ )
-        {
-                for ( var c = 0; c < table.rows[r].cells.length; c++ )
-                {
-                        table.rows[r].cells[c].width = "";
-                        table.rows[r].cells[c].height = "";
-                        table.rows[r].cells[c].removeAttribute( "WIDTH" );
-                        table.rows[r].cells[c].removeAttribute( "HEIGHT" );
-                }
-        }
-}
-
-//Cleanup table widths. If bPercent, recalculates table widths in %. If bClear,
-//moves all table widths as early as possible
-
-FCKTableHandler.CleanupTableWidths = function( table, bPercent, bClear, aMapIn )
-{
-        var aMap = aMapIn ? aMapIn : this._CreateTableMap( table ) ;
-        var nCols = aMap[0].length;
-        var nRows = aMap.length;
-        var nTotalWidth = 0;
-        var aSizeCells = new Array();
-        var aSizes = new Array();
-        //work the table column-by-column
-        for ( var nCol = 0; nCol < nCols; nCol++ )
-        {
-                var nMax = 0;
-                var oCell = null;
-                //walk the rows for a specific column -- find the topmost non-colspan'd item
-                //and the maximum pixel width ( according to the browser )
-                for ( var nRow = 0; nRow < nRows; nRow++ )
-                {
-                        if ( aMap[nRow][nCol].colSpan > 1 ) continue;
-                        //use topmost non-colspan'd cell to put the width in
-                        if ( !oCell ) oCell = aMap[nRow][nCol];
-                        if ( aMap[nRow][nCol].offsetWidth > nMax ) nMax = aMap[nRow][nCol].offsetWidth;
-                }
-                aSizes[nCol] = nMax;
-                nTotalWidth += nMax;
-                aSizeCells[nCol] = oCell;
-        }
-        //if we were asked for percentage width, go through and convert the sizes to %. note
-        //that we do this based on the calculated width of all the cells; this is more
-        //reliable because offsetWidth, et al., includes table borders, padding, etc.
-        for ( var nCol = 0; nCol < aSizeCells.length; nCol++ )
-        {
-                if ( bPercent )
-                {
-                        var nWidth = Math.round( 100 * (aSizeCells[nCol].offsetWidth/nTotalWidth ));
-                        if ( nWidth == 0 ) nWidth = 1;
-                        strWidth =  nWidth + "%";
-                }
-                else
-                {
-                        strWidth =  aSizes[nCol];
-                }
-
-                //set all width attributes
-                for ( var nRow = 0; nRow < nRows; nRow++ )
-                {
-                        if ( aMap[nRow][nCol].colSpan == 1 )
-                        {
-                                aMap[nRow][nCol].width = bClear ? '' : strWidth;
-                                if ( bClear ) aMap[nRow][nCol].removeAttribute( "width" );
-                                aSizeCells[nCol].width = strWidth;
-                        }
-                }
-        }
-}
-
-// Move the cursor into the next ( or previous ) cell
-FCKTableHandler.MoveToNextCell = function( bRev )
-{
-        var aCells = FCKTableHandler.GetSelectedCells();
-        if ( aCells.length == 0 ) return;
-        var oCell = aCells[0];
-        var oNextCell = bRev ? oCell.previousSibling: oCell.nextSibling;
-        if ( !oNextCell )
-        {
-                var oNext;
-                var oRow = FCKTools.GetElementAscensor( oCell,"TR" );
-                if ( bRev )
-                {
-                        if ( !(oNext = oRow.previousSibling )) return;
-                        oNextCell=oNext.cells[oNext.cells.length - 1];
-                }
-                else
-                {
-                        if ( !(oNext = oRow.nextSibling )) return;
-                        oNextCell=oNext.cells[0];
-                }
-        }
-        FCKSelection.SelectNode( oNextCell );
-        FCKSelection.Collapse();
-}
-//////////////////////////////////////////////////////////////////
-// Table Sizer
-//
-
-
-// Returns the closest sizeable cell to point (or the left of the specified point
-// if between cells). Generally, this will be a heading cell (i.e. a cell in
-// the first row). If *all* the candidate cells are colspan'd (heaven forbid),
-// don't allow sizing. x and y are in client coordinates
-
-FCKTableHandler.SizableCellFromPoint = function( table, ncx, ncy )
-{
-        var aRows = table.rows ;
-        var x = ncx - this._CalcPosition( table )[0];
-        for ( var i = 0 ; i < aRows.length ; i++  )
-        {
-                for ( var j = 0; j < aRows[i].cells.length - 1; j++ )
-                {
-                        if ( aRows[i].cells[j + 1].offsetLeft > x )
-                        {
-                                if ( aRows[i].cells[j].colSpan < 2 )
-                                {
-                                        return aRows[i].cells[j];
-                                }
-                                else
-                                {
-                                        break;
-                                }
-                        }       
-                }
-        }
-        return null;
-}
-
-// Creates the table resize bar. If a table resize bar is present, uses it. You
-// must explicitly destroy the table resize bar with DestroyResizeBar after use.
-FCKTableHandler.CreateResizeBar = function()
-{
-        if ( this.ResizeBar ) return this.ResizeBar;
-        var oBar;       
-        oBar = FCK.EditorDocument.createElement( "SPAN" );
-
-        // setup the bar
-        oBar.id = '__FCKResizeBar';
-        oBar.style.position = "absolute";
-        oBar.style.top = "0px";
-        oBar.style.left = "0px";
-        oBar.style.height = "0px";
-        oBar.style.width = "2px";
-        oBar.style.borderLeft = "1px solid #0033FF";
-        oBar.style.display = "none";
-        oBar.style.cursor = "e-resize";
-
-        FCK.EditorDocument.body.appendChild( oBar );
-        this.ResizeBar = oBar;
-        return oBar;
-}
-
-// Destroys the table resize bar
-FCKTableHandler.DestroyResizeBar = function()
-{
-        if ( !this.ResizeBar ) return;
-        this.ResizeBar.parentNode.removeChild( FCKTableHandler.ResizeBar );
-        this.ResizeBar = null;
-}
-
-// Figures out whether we want to size or let the browser do its thing. We can
-// size if the table is the target and we're between cells, OR if we're on
-// a table cell and on the far right edge of the cell within 3px of the edge
-// ( allows us to easily size tables with thin borders )
-
-FCKTableHandler.CanSizeHere = function( ev, cell, tbl )
-{
-        var elem = ev.srcElement || ev.originalTarget;
-        var aCellLoc = this._CalcPosition( cell );
-        var aTableLoc = this._CalcPosition( tbl );
-        //in the td client area, but not on the edge
-        if ( elem != tbl ) return ( (aCellLoc[0] + cell.offsetWidth - ev.clientX ) < 3);
-        //on the table edge
-        if ( (aTableLoc[0] + tbl.offsetWidth - ev.clientX ) < 3 ||
-                        ( aTableLoc[0] - ev.clientX ) < 3 ||
-                        ( aTableLoc[1] + tbl.offsetHeight - ev.clientY < 3 ) ||
-                        ( aTableLoc[1] - ev.clientY < 3 )) return false;
-        return true;
-}
-
-
-// Sets up table sizing
-FCKTableHandler.StartTableSizing = function( ev, cell, tbl )
-{
-        if ( !cell ) return null;
-        this.tableMap = this._CreateTableMap( tbl ) ;
-        var aCellLoc = this._GetCellLocation( this.tableMap, cell );                            //returns [row,col]
-        if ( !aCellLoc ) return null;
-        //we're in the last column, so we can't size
-        if ( aCellLoc[1] == this.tableMap[aCellLoc[0]].length - 1 ) return null;
-        var nTarget = aCellLoc[1] + 1;
-        this.adjacentCell = null;
-        for ( var i=0; i < this.tableMap.length; i++ )
-        {
-                if ( this.tableMap[i][nTarget].colSpan < 2 )
-                {
-                        this.adjacentCell = this.tableMap[i][nTarget];
-                        break;
-                }
-        }
-        if ( this.adjacentCell == null ) return null;   //can't size, no adjacent col
-        this.targetCell = cell;
-        //ok. we have everything we need. off we go.
-
-        //create the resize bar
-        this.pixWidths = !( this.targetCell.width.search('%' ) == -1 || !this.targetCell.width);
-        var oVBar = this.CreateResizeBar();
-        //oVBar.style.left = FCK.EditorDocument.body.scrollLeft + this._CalcPosition( cell ) + cell.offsetWidth;
-        //this.origPos = FCK.EditorDocument.body.scrollLeft + ev.clientX;
-        this.origPos = FCK.EditorDocument.body.scrollLeft + this._CalcPosition( cell )[0] + cell.offsetWidth;
-        oVBar.style.left = this.origPos;
-        oVBar.style.cursor = "e-resize";
-        oVBar.setAttribute( "UNSELECTABLE","on" );
-        tbl.setAttribute( "UNSELECTABLE","on" );
-        this.sizeOffset = ev.clientX - this.origPos;
-        //minimum size is always the left edge of the cell + some safety margin.
-        //max size is always the right edge of the next cell - some safety margin
-        this.minSize = FCK.EditorDocument.body.scrollLeft + this._CalcPosition( cell )[0] + 10;
-        this.maxSize = FCK.EditorDocument.body.scrollLeft + this._CalcPosition( this.adjacentCell )[0] + this.adjacentCell.offsetWidth - 10;
-        oVBar.style.top = this._CalcPosition( tbl )[1];
-        oVBar.style.height = tbl.clientHeight + ( tbl.border*2 );
-        oVBar.style.display = "inline";
-        this.CleanupTableWidths( tbl,false, true,this.tableMap );
-        return true;
-}
-
-FCKTableHandler.FinishTableSizing = function()
-{
-        var tbl = FCKTools.GetElementAscensor( this.targetCell,"TABLE" );
-        var nTargetDiff = this.ResizeBar.offsetLeft - this.origPos;
-        //widths are in pixels after StartTableSizing, so this is safe
-        tbl.style.cursor = '';
-        if ( tbl.runtimeStyle ) tbl.runtimeStyle.cursor = '';
-        this.targetCell.width = parseInt( this.targetCell.width ) + nTargetDiff;
-        this.adjacentCell.width = parseInt( this.adjacentCell.width ) - nTargetDiff;
-        this.DestroyResizeBar();
-        this.CleanupTableWidths( tbl,this.pixWidths,true,this.tableMap );
-        this.targetCell = null;
-        this.origPos = null;
-        tbl.removeAttribute( "UNSELECTABLE" );
-        if ( FCKBrowserInfo.IsGecko  ) tbl.style.MozUserSelect = "";
-}
-
-// Sizes the table to the given mouse position
-FCKTableHandler.SizeTo = function( x )
-{
-        var nPos = x - this.sizeOffset;
-        if ( nPos > this.maxSize ) nPos = this.maxSize;
-        if ( nPos < this.minSize ) nPos = this.minSize;
-        //runtimeStyle is way faster under IE
-        if ( this.ResizeBar.runtimeStyle )
-                this.ResizeBar.runtimeStyle.left = nPos;
-        else
-                this.ResizeBar.style.left = nPos;
-        if ( FCKBrowserInfo.IsIE && FCK.EditorDocument.selection.type != 'None' ) 
-                FCK.EditorDocument.selection.collapse();
-}
-
-// returns TRUE if we are actively sizing a table
-FCKTableHandler.IsTableSizing = function()
-{
-        return ( this.targetCell != null );
-}
-
-// figure out where ( with respect to the edge of the parent ) a given table/cell is
-FCKTableHandler._CalcPosition = function( ob )
-{
-        var oParent=ob;
-        var nY = 0;
-        var nX = 0;
-        while ( oParent && oParent.tagName != "BODY" )
-        {
-                nX += oParent.offsetLeft;
-                nY += oParent.offsetTop;
-                oParent = oParent.offsetParent;
-        }
-        return [nX,nY];
-}
-
-FCKTableHandler.tbl_MouseDown = function ( FCK, e )
-{
-        var elem = e.srcElement || e.originalTarget;
-        var strTag = elem ? elem.tagName.toUpperCase() : null;
-        //find the table we're part of, if we are
-        if ( elem && (strTag == 'TABLE' || strTag == 'TD' || strTag == 'TH' ) )
-        {
-                FCKTableHandler.targetCell = null;
-                var oTable = FCKTools.GetElementAscensor( elem, "TABLE" );
-                //figure out if there's a cell we can size
-                var oCell = FCKTableHandler.SizableCellFromPoint( oTable, e.clientX, e.clientY );
-                if ( !oCell ) return true;
-                if ( FCKTableHandler.CanSizeHere( e,oCell,oTable ) )
-                {
-                        if ( FCKTableHandler.StartTableSizing( e,oCell, oTable ) )
-                        {
-                                if ( oTable.runtimeStyle ) oTable.runtimeStyle.cursor = "e-resize";
-                                if ( FCKBrowserInfo.IsGecko  ) oTable.style.MozUserSelect = "none";
-                                e.cancelBubble  = true ;
-                                e.returnValue   = false ;
-                                return false;
-                        }
-                }
-        }
-        return true;
-}
-
-FCKTableHandler.tbl_MouseUp = function ( FCK, e )
-{
-        if ( FCKTableHandler.IsTableSizing( )) FCKTableHandler.FinishTableSizing();
-}
-
-FCKTableHandler.tbl_MouseMove = function ( FCK, e )
-{
-        var elem = e.srcElement || e.originalTarget;
-        if ( FCKTableHandler.IsTableSizing() )
-        {
-                FCKTableHandler.SizeTo( e.clientX );
-                e.cancelBubble  = true ;
-                e.returnValue   = false ;
-                return false;
-        }
-
-        if ( elem.tagName.toUpperCase() == 'TABLE' )
-        {
-                //let the browser handle global sizing and move if the user is on
-                //the RH edge of a table
-                if ( elem.clientWidth - e.offsetX < 3 ||
-                                elem.clientHeight - e.offsetY < 3 ||
-                                e.offsetX < 2 || e.offsetY < 2 )
-                {
-                        elem.style.cursor = ""; 
-                        return true;
-                }
-                //block browser sizing -- we're going to do it ourselves, thanks
-                if ( elem.runtimeStyle ) elem.runtimeStyle.cursor = "e-resize";
-                e.cancelBubble  = true ;
-                e.returnValue   = false ;
-                return false;
-        }
-        else if ( elem.tagName.toUpperCase() == 'TD' )
-        {
-                var tbl = FCKTools.GetElementAscensor( elem, "TABLE" );
-                if ( e.offsetX >= (elem.offsetWidth - 4 ))
-                {
-                        e.cancelBubble  = true ;
-                        e.returnValue   = false ;
-                        return false;
-                }
-        }
-        return true;
-}
-
-FCK.Events.AttachEvent( "OnMouseMove", FCKTableHandler.tbl_MouseMove );
-FCK.Events.AttachEvent( "OnMouseDown", FCKTableHandler.tbl_MouseDown );
-FCK.Events.AttachEvent( "OnMouseUp", FCKTableHandler.tbl_MouseUp );
-
 FCKTableHandler.ClearRow = function( tr )
 {

FCKeditor/branches/developers/martinkou/editor/_source/internals/fcktools.js

@@ -94 +94 @@
                 return '' ;
 
-}
-
-//convert text to Proper Case
-FCKTools.ProperCase = function( text )
-{
-        var strPC = text.toLowerCase();
-        return strPC.replace(/(\S)(\S*\s*)/g,
-                                                function(str,p1,p2) 
-                                                        {return p1.toUpperCase()+p2});
-}
-
-FCKTools.HTMLToText = function( st )
-{
-        if ( !st ) 
-                return null;
-                
-        st = st.replace(/<([^>]*?)>/g,'');
-        st = st.replace(/&nbsp;/gi,' ');
-        return st;
-        text = text.replace( /&/g, '&amp;' ) ;
-        text = text.replace( /</g, '&lt;' ) ;
-        text = text.replace( />/g, '&gt;' ) ;
-
-        return text ;
 }
 

FCKeditor/branches/developers/martinkou/fckconfig.js

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