| [cell | ...
+ if ( this.startContainer.type == CKEDITOR.NODE_ELEMENT && this.startContainer.getName() in nonCells
+ || this.endContainer.type == CKEDITOR.NODE_ELEMENT && this.endContainer.getName() in nonCells )
+ {
+ this.shrink( CKEDITOR.NODE_ELEMENT, true );
+ }
+
+ var bookmark = this.createBookmark();
+
+ // Create marker tags for the start and end boundaries.
+ var startNode = bookmark.startNode;
+
+ var endNode;
+ if ( !collapsed )
+ endNode = bookmark.endNode;
+
+ // Create the main range which will be used for the selection.
+ var ieRange = this.document.$.body.createTextRange();
+
+ // Position the range at the start boundary.
+ ieRange.moveToElementText( startNode.$ );
+ ieRange.moveStart( 'character', 1 );
+
+ if ( endNode )
+ {
+ // Create a tool range for the end.
+ var ieRangeEnd = this.document.$.body.createTextRange();
+
+ // Position the tool range at the end.
+ ieRangeEnd.moveToElementText( endNode.$ );
+
+ // Move the end boundary of the main range to match the tool range.
+ ieRange.setEndPoint( 'EndToEnd', ieRangeEnd );
+ ieRange.moveEnd( 'character', -1 );
+ }
+ else
+ {
+ // The isStartMarkerAlone logic comes from V2. It guarantees that the lines
+ // will expand and that the cursor will be blinking on the right place.
+ // Actually, we are using this flag just to avoid using this hack in all
+ // situations, but just on those needed.
+ var next = startNode.getNext( notWhitespaces );
+ isStartMarkerAlone = ( !( next && next.getText && next.getText().match( fillerTextRegex ) ) // already a filler there?
+ && ( forceExpand || !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) ) ) );
+
+ // Append a temporary before the selection.
+ // This is needed to avoid IE destroying selections inside empty
+ // inline elements, like (#253).
+ // It is also needed when placing the selection right after an inline
+ // element to avoid the selection moving inside of it.
+ dummySpan = this.document.createElement( 'span' );
+ dummySpan.setHtml( '' ); // Zero Width No-Break Space (U+FEFF). See #1359.
+ dummySpan.insertBefore( startNode );
+
+ if ( isStartMarkerAlone )
+ {
+ // To expand empty blocks or line spaces after
, we need
+ // instead to have any char, which will be later deleted using the
+ // selection.
+ // \ufeff = Zero Width No-Break Space (U+FEFF). (#1359)
+ this.document.createText( '\ufeff' ).insertBefore( startNode );
+ }
+ }
+
+ // Remove the markers (reset the position, because of the changes in the DOM tree).
+ this.setStartBefore( startNode );
+ startNode.remove();
+
+ if ( collapsed )
+ {
+ if ( isStartMarkerAlone )
+ {
+ // Move the selection start to include the temporary \ufeff.
+ ieRange.moveStart( 'character', -1 );
+
+ ieRange.select();
+
+ // Remove our temporary stuff.
+ this.document.$.selection.clear();
+ }
+ else
+ ieRange.select();
+
+ this.moveToPosition( dummySpan, CKEDITOR.POSITION_BEFORE_START );
+ dummySpan.remove();
+ }
+ else
+ {
+ this.setEndBefore( endNode );
+ endNode.remove();
ieRange.select();
-
- // Remove our temporary stuff.
- this.document.$.selection.clear();
- }
- else
- ieRange.select();
-
- this.moveToPosition( dummySpan, CKEDITOR.POSITION_BEFORE_START );
- dummySpan.remove();
- }
- else
- {
- this.setEndBefore( endNode );
- endNode.remove();
- ieRange.select();
- }
-
- this.document.fire( 'selectionchange' );
- }
- :
- function()
- {
- var startContainer = this.startContainer;
-
- // If we have a collapsed range, inside an empty element, we must add
- // something to it, otherwise the caret will not be visible.
- if ( this.collapsed && startContainer.type == CKEDITOR.NODE_ELEMENT && !startContainer.getChildCount() )
- startContainer.append( new CKEDITOR.dom.text( '' ) );
-
- var nativeRange = this.document.$.createRange();
- nativeRange.setStart( startContainer.$, this.startOffset );
-
- try
- {
- nativeRange.setEnd( this.endContainer.$, this.endOffset );
- }
- catch ( e )
- {
- // There is a bug in Firefox implementation (it would be too easy
- // otherwise). The new start can't be after the end (W3C says it can).
- // So, let's create a new range and collapse it to the desired point.
- if ( e.toString().indexOf( 'NS_ERROR_ILLEGAL_VALUE' ) >= 0 )
- {
- this.collapse( true );
+ }
+
+ this.document.fire( 'selectionchange' );
+ }
+ :
+ function()
+ {
+ var startContainer = this.startContainer;
+
+ // If we have a collapsed range, inside an empty element, we must add
+ // something to it, otherwise the caret will not be visible.
+ if ( this.collapsed && startContainer.type == CKEDITOR.NODE_ELEMENT && !startContainer.getChildCount() )
+ startContainer.append( new CKEDITOR.dom.text( '' ) );
+
+ var nativeRange = this.document.$.createRange();
+ nativeRange.setStart( startContainer.$, this.startOffset );
+
+ try
+ {
nativeRange.setEnd( this.endContainer.$, this.endOffset );
}
- else
- throw( e );
- }
-
- var selection = this.document.getSelection().getNative();
- selection.removeAllRanges();
- selection.addRange( nativeRange );
- };
+ catch ( e )
+ {
+ // There is a bug in Firefox implementation (it would be too easy
+ // otherwise). The new start can't be after the end (W3C says it can).
+ // So, let's create a new range and collapse it to the desired point.
+ if ( e.toString().indexOf( 'NS_ERROR_ILLEGAL_VALUE' ) >= 0 )
+ {
+ this.collapse( true );
+ nativeRange.setEnd( this.endContainer.$, this.endOffset );
+ }
+ else
+ throw( e );
+ }
+
+ var selection = this.document.getSelection().getNative();
+ selection.removeAllRanges();
+ selection.addRange( nativeRange );
+ };
} )();
Index: /CKEditor/branches/features/contenteditable/_source/plugins/sourcearea/plugin.js
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/sourcearea/plugin.js (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/sourcearea/plugin.js (revision 5659)
@@ -192,4 +192,5 @@
{
modes : { wysiwyg:1, source:1 },
+ editorFocus : false,
exec : function( editor )
Index: /CKEditor/branches/features/contenteditable/_source/plugins/styles/plugin.js
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/styles/plugin.js (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/styles/plugin.js (revision 5659)
@@ -61,5 +61,5 @@
// Save the current state, so it can be compared next
// time.
- callback.state !== currentState;
+ callback.state = currentState;
}
}
@@ -67,5 +67,5 @@
}
- // Save the callback info, so it can be checked on the next occurence of
+ // Save the callback info, so it can be checked on the next occurrence of
// selectionChange.
styleStateChangeCallbacks.push( { style : style, fn : callback } );
@@ -181,4 +181,8 @@
},
+ /**
+ * Whether this style can be applied at the element path.
+ * @param elementPath
+ */
checkApplicable : function( elementPath )
{
@@ -223,4 +227,6 @@
var elementAttr = element.getAttribute( attName ) || '';
+
+ // Special treatment for 'style' attribute is required.
if ( attName == 'style' ?
compareCssText( attribs[ attName ], normalizeCssText( elementAttr, false ) )
@@ -766,4 +772,5 @@
}
+ var nonWhitespaces = CKEDITOR.dom.walker.whitespaces( true );
/**
* Merge a block with a previous sibling if available.
@@ -772,5 +779,5 @@
{
var previousBlock;
- if ( !( ( previousBlock = preBlock.getPreviousSourceNode( true, CKEDITOR.NODE_ELEMENT ) )
+ if ( !( ( previousBlock = preBlock.getPrevious( nonWhitespaces ) )
&& previousBlock.is
&& previousBlock.is( 'pre') ) )
@@ -1196,4 +1203,5 @@
}
+ // Make the comparison of attribute value easier by standardizing it.
function normalizeProperty( name, value, isStyle )
{
@@ -1203,4 +1211,5 @@
}
+ // Make the comparison of style text easier by standardizing it.
function normalizeCssText( unparsedCssText, nativeNormalize )
{
@@ -1238,4 +1247,10 @@
}
+ /**
+ * Compare two bunch of styles, with the speciality that value 'inherit'
+ * is treated as a wildcard which will match any value.
+ * @param {Object|String} source
+ * @param {Object|String} target
+ */
function compareCssText( source, target )
{
@@ -1244,6 +1259,4 @@
for( var name in source )
{
- // Value 'inherit' is treated as a wildcard,
- // which will match any value.
if ( !( name in target &&
( target[ name ] == source[ name ]
Index: /CKEditor/branches/features/contenteditable/_source/plugins/tab/plugin.js
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/tab/plugin.js (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/tab/plugin.js (revision 5659)
@@ -28,4 +28,76 @@
};
+ function selectNextCellCommand( backward )
+ {
+ return {
+ editorFocus : false,
+ canUndo : false,
+ modes : { wysiwyg : 1 },
+ exec : function( editor )
+ {
+ if ( editor.focusManager.hasFocus )
+ {
+ var sel = editor.getSelection(),
+ ancestor = sel.getCommonAncestor(),
+ cell;
+
+ if ( cell = ( ancestor.getAscendant( 'td', true ) || ancestor.getAscendant( 'th', true ) ) )
+ {
+ var resultRange = new CKEDITOR.dom.range( editor.document ),
+ next = CKEDITOR.tools.tryThese( function()
+ {
+ var row = cell.getParent(),
+ next = row.$.cells[ cell.$.cellIndex + ( backward ? - 1 : 1 ) ];
+
+ // Invalid any empty value.
+ next.parentNode.parentNode;
+ return next;
+ },
+ function()
+ {
+ var row = cell.getParent(),
+ table = row.getAscendant( 'table' ),
+ nextRow = table.$.rows[ row.$.rowIndex + ( backward ? - 1 : 1 ) ];
+
+ return nextRow.cells[ backward? nextRow.cells.length -1 : 0 ];
+ });
+
+ // Clone one more row at the end of table and select the first newly established cell.
+ if ( ! ( next || backward ) )
+ {
+ var table = cell.getAscendant( 'table' ).$,
+ cells = cell.getParent().$.cells;
+
+ var newRow = new CKEDITOR.dom.element( table.insertRow( -1 ), editor.document );
+
+ for ( var i = 0, count = cells.length ; i < count; i++ )
+ {
+ var newCell = newRow.append( new CKEDITOR.dom.element(
+ cells[ i ], editor.document ).clone( false, false ) );
+ !CKEDITOR.env.ie && newCell.appendBogus();
+ }
+
+ resultRange.moveToElementEditStart( newRow );
+ }
+ else if ( next )
+ {
+ next = new CKEDITOR.dom.element( next );
+ resultRange.moveToElementEditStart( next );
+ // Avoid selecting empty block makes the cursor blind.
+ if ( !( resultRange.checkStartOfBlock() && resultRange.checkEndOfBlock() ) )
+ resultRange.selectNodeContents( next );
+ }
+ else
+ return true;
+
+ resultRange.select( true );
+ return true;
+ }
+ }
+ return false;
+ }
+ };
+ }
+
CKEDITOR.plugins.add( 'tab',
{
@@ -34,5 +106,6 @@
init : function( editor )
{
- var tabSpaces = editor.config.tabSpaces || 0,
+ var tabTools = editor.config.enableTabKeyTools !== false,
+ tabSpaces = editor.config.tabSpaces || 0,
tabText = '';
@@ -52,4 +125,14 @@
}
+ if ( tabTools )
+ {
+ editor.on( 'key', function( ev )
+ {
+ if ( ev.data.keyCode == 9 && editor.execCommand( 'selectNextCell' ) || // TAB
+ ev.data.keyCode == ( CKEDITOR.SHIFT + 9 ) && editor.execCommand( 'selectPreviousCell' ) ) // SHIFT+TAB
+ ev.cancel();
+ });
+ }
+
if ( CKEDITOR.env.webkit || CKEDITOR.env.gecko )
{
@@ -74,4 +157,6 @@
editor.addCommand( 'blur', CKEDITOR.tools.extend( blurCommand, meta ) );
editor.addCommand( 'blurBack', CKEDITOR.tools.extend( blurBackCommand, meta ) );
+ editor.addCommand( 'selectNextCell', selectNextCellCommand() );
+ editor.addCommand( 'selectPreviousCell', selectNextCellCommand( true ) );
}
});
@@ -260,2 +345,21 @@
* config.tabSpaces = 4;
*/
+
+/**
+ * Allow context-sensitive tab key behaviors, including the following scenarios:
+ * When selection is anchored inside table cells:
+ *
+ * - If TAB is pressed, select the contents of the "next" cell. If in the last cell in the table, add a new row to it and focus its first cell.
+ * - If SHIFT+TAB is pressed, select the contents of the "previous" cell. Do nothing when it's in the first cell.
+ *
+ * @name CKEDITOR.config.enableTabKeyTools
+ * @type Boolean
+ * @default true
+ * @example
+ * config.enableTabKeyTools = false;
+ */
+
+CKEDITOR.config.keystrokes.push(
+ [ CKEDITOR.ALT + 38 /*Arrow Up*/, 'selectPreviousCell' ],
+ [ CKEDITOR.ALT + 40 /*Arrow Down*/, 'selectNextCell' ]
+);
Index: /CKEditor/branches/features/contenteditable/_source/plugins/tableresize/plugin.js
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/tableresize/plugin.js (revision 5659)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/tableresize/plugin.js (revision 5659)
@@ -0,0 +1,317 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+( function()
+{
+ var pxUnit = CKEDITOR.tools.cssLength;
+
+ function getCellWidth( cell )
+ {
+ return CKEDITOR.env.ie ? cell.$.clientWidth : parseInt( cell.getComputedStyle( 'width' ), 10 );
+ }
+
+ function getCellBorderWidth( cell, side )
+ {
+ var computed = cell.getComputedStyle( 'border-' + side + '-width' ),
+ borderMap =
+ {
+ thin: '2px',
+ medium: '4px',
+ thick: '6px'
+ };
+
+ if ( computed.indexOf( 'px' ) < 0 )
+ {
+ // look up keywords
+ if ( computed in borderMap && cell.getComputedStyle( 'border-style' ) != 'none' )
+ computed = borderMap[ computed ];
+ else
+ computed = 0;
+ }
+
+ return computed;
+ }
+
+ function buildTableColumnPillars( tableElement )
+ {
+ var table = tableElement.$;
+
+ // Elect the table row that contains the most columns.
+ var maxCells = 0, elected;
+ for ( var i = 0, rowCount = table.rows.length ; i < rowCount; i++ )
+ {
+ var tr = table.rows[ i ], cellsCount = tr.cells.length;
+
+ if ( cellsCount > maxCells )
+ {
+ maxCells = cellsCount;
+ elected = tr;
+ }
+ }
+
+ tr = elected;
+ var columnIndex = -1, pillars = [];
+ var tbody = new CKEDITOR.dom.element( table.tBodies[ 0 ] ),
+ tbodyPosition = tbody.getDocumentPosition();
+ for ( var j = 0, colCount = tr.cells.length ; j < colCount ; j++ )
+ {
+ var td = new CKEDITOR.dom.element( tr.cells[ j ] ),
+ nextTd = tr.cells[ j + 1 ] && new CKEDITOR.dom.element( tr.cells[ j + 1 ] );
+
+ columnIndex += td.$.colSpan || 1;
+ var cellPosition = td.getDocumentPosition(),
+ rangeLeft = cellPosition.x + td.$.offsetWidth - parseInt( getCellBorderWidth ( td, 'right' ), 10 );
+
+ if ( nextTd )
+ {
+ cellPosition = nextTd.getDocumentPosition();
+ var rangeRight = cellPosition.x + parseInt( getCellBorderWidth( nextTd, 'left' ), 10 );
+
+ // Compsensate for too "slim" line between columns, make the pillar shown easier.
+ if ( rangeRight - rangeLeft < 8 )
+ {
+ rangeLeft-= 4;
+ rangeRight += 4;
+ }
+
+ var columnWidth = rangeRight - rangeLeft;
+
+ // The pillar should reflects exactly the shape of the hovered column border line.
+ pillars.push({ table : tableElement, index : columnIndex, x : rangeLeft, y : tbodyPosition.y , width : columnWidth, height: tbody.$.offsetHeight });
+ }
+ }
+
+ return pillars;
+ }
+
+ function getPillarAtPosition( pillars, position )
+ {
+ for ( var i = 0, length = pillars.length; i < length; i++ )
+ {
+ if ( position.x > pillars[ i ].x && position.x - pillars[ i ].x < pillars[ i ].width )
+ return pillars[ i ];
+ }
+ return null;
+ }
+
+ function cancel( evt )
+ {
+ evt.data.preventDefault();
+ }
+
+ function columnResizer( editor )
+ {
+ var pillar, document, resizer, startOffset, currentShift;
+
+ var leftSideCells, rightSideCells, leftShiftBoundary, rightShiftBoundary;
+
+ function detach()
+ {
+ pillar = null;
+ currentShift = null;
+ document.removeListener( 'mousemove', onMouseMove );
+ document.removeListener( 'mouseup', onMouseUp );
+ resizer.removeListener( 'mousedown', onMouseDown );
+ resizer.removeListener( 'mouseout', onMouseOut );
+ resizer.hide();
+ }
+
+ function resizeStart()
+ {
+ // Before starting to resize, figure out which cells to change
+ // and the boundaries of this resizing shift.
+ var columnIndex = pillar.index,
+ map = CKEDITOR.tools.buildTableMap( pillar.table ),
+ leftColumnCells = [],
+ rightColumnCells= [],
+ leftMinSize = Number.MAX_VALUE,
+ rightMinSize = leftMinSize;
+
+ for ( var i = 0, rowCount = map.length; i < rowCount; i++ )
+ {
+ var row = map[ i ],
+ leftCell = new CKEDITOR.dom.element( row[ columnIndex ] ),
+ rightCell = new CKEDITOR.dom.element( row[ columnIndex + 1 ] );
+
+ if ( !leftCell.equals( rightCell ) )
+ {
+ leftMinSize = Math.min( leftMinSize, getCellWidth( leftCell ) );
+ rightMinSize = Math.min( rightMinSize, getCellWidth( rightCell ) );
+ leftColumnCells.push( leftCell );
+ rightColumnCells.push( rightCell );
+ }
+ }
+
+ leftSideCells = leftColumnCells;
+ rightSideCells = rightColumnCells;
+ leftShiftBoundary = pillar.x - leftMinSize;
+ rightShiftBoundary = pillar.x + rightMinSize;
+
+ resizer.setOpacity( 0.5 );
+ startOffset = parseInt( resizer.getStyle( 'left' ), 10 );
+ currentShift = 0;
+ document.on( 'mousemove', onMouseMove, this );
+ // Prevent the native drag behavior otherwise the above 'mousemove' won't fired.
+ document.on( 'dragstart', cancel, this );
+ }
+
+ function resizeEnd()
+ {
+ resizer.setOpacity( 0 );
+ currentShift && resizeColumn();
+
+ var table = pillar.table;
+ setTimeout( function () { table.removeCustomData( '_cke_table_pillars' ); }, 0 );
+
+ detach();
+ }
+
+ function resizeColumn()
+ {
+ // Perform the actual resize to table cells, only for those by side of the pillar.
+ for ( var i = 0, count = leftSideCells.length; i < count; i++ )
+ {
+ var leftCell = leftSideCells[ i ],
+ rightCell = rightSideCells[ i ];
+
+ // Defer the resizing to avoid any interference among cells.
+ ( function( leftCell, leftOldWidth, rightCell, rightOldWidth, sizeShift )
+ {
+ CKEDITOR.tools.setTimeout( function()
+ {
+ leftCell.setStyle( 'width', pxUnit( leftOldWidth + sizeShift ) );
+ rightCell.setStyle( 'width', pxUnit( rightOldWidth - sizeShift ) );
+
+ }, 0, this );
+
+ }).call( this, leftCell, getCellWidth( leftCell ),
+ rightCell, getCellWidth( rightCell ), currentShift );
+ }
+ }
+
+ function onMouseMove( evt )
+ {
+ var mouseOffset = evt.data.$.clientX,
+ resizerNewPosition = mouseOffset - Math.round( parseInt( resizer.getComputedStyle( 'width' ), 10 ) / 2 );
+
+ // Boundaries checking.
+ if ( resizerNewPosition > leftShiftBoundary && resizerNewPosition < rightShiftBoundary )
+ {
+ resizer.setStyle( 'left', pxUnit( resizerNewPosition ) );
+ currentShift = resizerNewPosition - startOffset;
+ }
+
+ cancel( evt );
+ }
+
+ function onMouseDown( evt )
+ {
+ cancel( evt );
+ resizeStart();
+ document.on( 'mouseup', onMouseUp, this );
+ }
+
+ function onMouseUp()
+ {
+ resizeEnd();
+ }
+
+ function onMouseOut()
+ {
+ // Don't detach during resizing.
+ !currentShift && detach();
+ }
+
+ document = editor.document;
+ resizer = CKEDITOR.dom.element.createFromHtml( '' );
+
+ // Place the resizer after body to prevent it from being editable.
+ document.getDocumentElement().append( resizer );
+ this.attachTo = function( targetPillar )
+ {
+ // Accept only one pillar at a time.
+ if ( currentShift )
+ return;
+
+ pillar = targetPillar;
+ resizer.setStyles(
+ {
+ width: pxUnit( targetPillar.width ),
+ height : pxUnit( targetPillar.height ),
+ left : pxUnit( targetPillar.x ),
+ top : pxUnit( targetPillar.y )
+ });
+
+ resizer.on( 'mousedown', onMouseDown, this );
+ resizer.on( 'mouseout', onMouseOut, this );
+
+ // Display the resizer to receive events but don't show it,
+ // only change the cursor to resizable shape.
+ resizer.show();
+ };
+ }
+
+ function clearPillarsCache( evt )
+ {
+ var target = evt.data.getTarget();
+
+ if ( evt.name == 'mouseout' )
+ {
+ // Bypass interal mouse move.
+ if ( !target.is ( 'table' ) )
+ return;
+
+ var dest = new CKEDITOR.dom.element( evt.data.$.relatedTarget || evt.data.$.toElement );
+ while( dest && !dest.equals( target ) && !dest.is( 'body' ) )
+ dest = dest.getParent();
+ if ( !dest || dest.equals( target ) )
+ return;
+ }
+
+ target.getAscendant( 'table', true ).removeCustomData( '_cke_table_pillars' );
+ evt && evt.removeListener();
+ }
+
+ CKEDITOR.plugins.add( 'tableresize',
+ {
+ requires : [ 'tabletools' ],
+ init : function( editor )
+ {
+ editor.on( 'contentDom', function ()
+ {
+ var resizer;
+ editor.document.getBody().on( 'mousemove', function( evt )
+ {
+ evt = evt.data;
+
+ // Considering table, tr, td, tbody but nothing else.
+ var target = evt.getTarget();
+ if ( !( target.is( 'table' ) || target.getAscendant( 'tbody', true ) ) )
+ return;
+
+ var table = target.getAscendant( 'table', true ),
+ pillars;
+
+ if ( !( pillars = table.getCustomData( '_cke_table_pillars' ) ) )
+ {
+ // Cache table pillars caculation result.
+ table.setCustomData( '_cke_table_pillars', ( pillars = buildTableColumnPillars( table ) ) );
+ table.on( 'mouseout', clearPillarsCache );
+ table.on( 'mousedown', clearPillarsCache );
+ }
+
+ var pillar = getPillarAtPosition( pillars, { x : evt.$.clientX, y : evt.$.clientY } );
+ if ( pillar )
+ {
+ !resizer && ( resizer = new columnResizer( editor ) );
+ resizer.attachTo( pillar );
+ }
+ });
+ });
+ }
+ });
+
+} )( );
Index: /CKEditor/branches/features/contenteditable/_source/plugins/tabletools/plugin.js
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/tabletools/plugin.js (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/tabletools/plugin.js (revision 5659)
@@ -399,49 +399,4 @@
}
range.select( true );
- }
-
- function buildTableMap( table )
- {
-
- var aRows = table.$.rows ;
-
- // Row and Column counters.
- var r = -1 ;
-
- var aMap = [];
-
- for ( var i = 0 ; i < aRows.length ; i++ )
- {
- r++ ;
- !aMap[r] && ( aMap[r] = [] );
-
- var c = -1 ;
-
- for ( var j = 0 ; j < aRows[i].cells.length ; j++ )
- {
- var oCell = aRows[i].cells[j] ;
-
- c++ ;
- while ( aMap[r][c] )
- c++ ;
-
- var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ;
- var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ;
-
- for ( var rs = 0 ; rs < iRowSpan ; rs++ )
- {
- if ( !aMap[r + rs] )
- aMap[r + rs] = new Array() ;
-
- for ( var cs = 0 ; cs < iColSpan ; cs++ )
- {
- aMap[r + rs][c + cs] = aRows[i].cells[j] ;
- }
- }
-
- c += iColSpan - 1 ;
- }
- }
- return aMap ;
}
@@ -499,5 +454,5 @@
firstCell = cells[ 0 ],
table = firstCell.getAscendant( 'table' ),
- map = buildTableMap( table ),
+ map = CKEDITOR.tools.buildTableMap( table ),
mapHeight = map.length,
mapWidth = map[ 0 ].length,
@@ -634,5 +589,5 @@
tr = cell.getParent(),
table = tr.getAscendant( 'table' ),
- map = buildTableMap( table ),
+ map = CKEDITOR.tools.buildTableMap( table ),
rowIndex = tr.$.rowIndex,
colIndex = cellInRow( map, rowIndex, cell ),
@@ -710,5 +665,5 @@
tr = cell.getParent(),
table = tr.getAscendant( 'table' ),
- map = buildTableMap( table ),
+ map = CKEDITOR.tools.buildTableMap( table ),
rowIndex = tr.$.rowIndex,
colIndex = cellInRow( map, rowIndex, cell ),
@@ -1115,2 +1070,52 @@
CKEDITOR.plugins.add( 'tabletools', CKEDITOR.plugins.tabletools );
})();
+
+/**
+ * Create a two-dimension array that reflects the actual layout of table cells,
+ * with cell spans, with mappings to the original td elements.
+ * @param table {CKEDITOR.dom.element}
+ */
+CKEDITOR.tools.buildTableMap = function ( table )
+{
+ var aRows = table.$.rows ;
+
+ // Row and Column counters.
+ var r = -1 ;
+
+ var aMap = [];
+
+ for ( var i = 0 ; i < aRows.length ; i++ )
+ {
+ r++ ;
+ !aMap[r] && ( aMap[r] = [] );
+
+ var c = -1 ;
+
+ for ( var j = 0 ; j < aRows[i].cells.length ; j++ )
+ {
+ var oCell = aRows[i].cells[j] ;
+
+ c++ ;
+ while ( aMap[r][c] )
+ c++ ;
+
+ var iColSpan = isNaN( oCell.colSpan ) ? 1 : oCell.colSpan ;
+ var iRowSpan = isNaN( oCell.rowSpan ) ? 1 : oCell.rowSpan ;
+
+ for ( var rs = 0 ; rs < iRowSpan ; rs++ )
+ {
+ if ( !aMap[r + rs] )
+ aMap[r + rs] = [];
+
+ for ( var cs = 0 ; cs < iColSpan ; cs++ )
+ {
+ aMap[r + rs][c + cs] = aRows[i].cells[j] ;
+ }
+ }
+
+ c += iColSpan - 1 ;
+ }
+ }
+ return aMap ;
+};
+
Index: /CKEditor/branches/features/contenteditable/_source/plugins/wsc/dialogs/wsc.css
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/wsc/dialogs/wsc.css (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/wsc/dialogs/wsc.css (revision 5659)
@@ -71,5 +71,4 @@
border-bottom: #d5d59d 1px solid;
cursor: pointer;
- cursor: hand;
}
Index: /CKEditor/branches/features/contenteditable/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/plugins/wysiwygarea/plugin.js (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/plugins/wysiwygarea/plugin.js (revision 5659)
@@ -15,5 +15,5 @@
// Matching an empty paragraph at the end of document.
- var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
+ var emptyParagraphRegexp = /\s*<(p|div|address|h\d|center|li)[^>]*>\s*(?:]*>| |\u00A0| )?\s*(:?<\/\1>)?\s*(?=$|<\/body>)/gi;
function checkReadOnly( selection )
@@ -464,4 +464,24 @@
}
+ if ( CKEDITOR.env.gecko )
+ {
+ domDocument.on( 'mouseup', function( ev )
+ {
+ if ( ev.data.$.button == 2 )
+ {
+ var target = ev.data.getTarget();
+
+ // Prevent right click from selecting an empty block even
+ // when selection is anchored inside it. (#5845)
+ if ( !target.getOuterHtml().replace( emptyParagraphRegexp, '' ) )
+ {
+ var range = new CKEDITOR.dom.range( domDocument );
+ range.moveToElementEditStart( target );
+ range.select( true );
+ }
+ }
+ } );
+ }
+
// Webkit: avoid from editing form control elements content.
if ( CKEDITOR.env.webkit )
@@ -497,5 +517,6 @@
if ( evt.data.getTarget().equals( htmlElement ) )
{
- CKEDITOR.env.gecko && blinkCursor();
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+ blinkCursor();
focusGrabber.focus();
}
@@ -511,5 +532,8 @@
{
var doc = editor.document;
- if ( CKEDITOR.env.gecko || CKEDITOR.env.opera )
+
+ if ( CKEDITOR.env.gecko && CKEDITOR.env.version >= 10900 )
+ blinkCursor();
+ else if ( CKEDITOR.env.opera )
doc.getBody().focus();
else if ( CKEDITOR.env.webkit )
@@ -845,11 +869,28 @@
// Switch on design mode for a short while and close it after then.
- function blinkCursor()
+ function blinkCursor( retry )
{
- editor.document.$.designMode = 'on';
- setTimeout( function ()
- {
- editor.document.$.designMode = 'off';
- }, 50 );
+ CKEDITOR.tools.tryThese(
+ function()
+ {
+ editor.document.$.designMode = 'on';
+ setTimeout( function ()
+ {
+ editor.document.$.designMode = 'off';
+ editor.document.getBody().focus();
+ }, 50 );
+ },
+ function()
+ {
+ // The above call is known to fail when parent DOM
+ // tree layout changes may break design mode. (#5782)
+ // Refresh the 'contentEditable' is a cue to this.
+ editor.document.$.designMode = 'off';
+ var body = editor.document.getBody();
+ body.setAttribute( 'contentEditable', false );
+ body.setAttribute( 'contentEditable', true );
+ // Try it again once..
+ !retry && blinkCursor( 1 );
+ });
}
Index: /CKEditor/branches/features/contenteditable/_source/skins/kama/dialog.css
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/skins/kama/dialog.css (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/skins/kama/dialog.css (revision 5659)
@@ -677,5 +677,4 @@
border: outset 1px;
cursor: pointer;
- cursor: hand;
}
@@ -742,5 +741,4 @@
{
cursor: pointer;
- cursor: hand;
}
@@ -775,5 +773,4 @@
display: inline;
cursor: pointer;
- cursor: hand;
font-weight: bold;
position: relative;
Index: /CKEditor/branches/features/contenteditable/_source/skins/office2003/dialog.css
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/skins/office2003/dialog.css (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/skins/office2003/dialog.css (revision 5659)
@@ -608,5 +608,4 @@
border: outset 1px;
cursor: pointer;
- cursor: hand;
}
@@ -673,5 +672,4 @@
{
cursor: pointer;
- cursor: hand;
}
@@ -705,5 +703,4 @@
display: inline;
cursor: pointer;
- cursor: hand;
font-weight: bold;
position: relative;
Index: /CKEditor/branches/features/contenteditable/_source/skins/v2/dialog.css
===================================================================
--- /CKEditor/branches/features/contenteditable/_source/skins/v2/dialog.css (revision 5658)
+++ /CKEditor/branches/features/contenteditable/_source/skins/v2/dialog.css (revision 5659)
@@ -610,5 +610,4 @@
border: outset 1px;
cursor: pointer;
- cursor: hand;
}
@@ -675,5 +674,4 @@
{
cursor: pointer;
- cursor: hand;
}
@@ -707,5 +705,4 @@
display: inline;
cursor: pointer;
- cursor: hand;
font-weight: bold;
position: relative;