#5909 : New BiDi feature, making it possible to switch the base language direction of block elements.
+
#5268 : Introducing the "tableresize" plugin, which makes it possible to resize tables columns by mouse drag. It's not enabled by default, so it must be enabled in the configurations file.
+
#979 : New enableTabKeyTools configuration to allow using the TAB key to navigate through table cells.
+
#4606 : Introduce the "autogrow" plugin, which makes the editor resize automatically, based on the contents size.
#5418 : New "Advanced" tab introduced on the Table Properties dialog. It's based on the new dialogadvtab plugin.
+
#6082 : Introduced the useComputedState setting, making it possible to control whether toolbar features, like alignment and direction, should reflect the "computed" selection states, even when the effective feature value is not applied.
+
+
+ Fixed issues:
+
+
#5911 : BiDi: List items should support and retain correct base language direction
+
#5689 : Make it possible to run CKEditor inside of Firefox chrome.
+
#6042 : It wasn't possible to align a paragraph with the dir attribute to the opposite direction.
+
#6058 : Fixed a small style glitch with file upload fields in IE+Quirks.
';
return {
Index: /CKEditor/trunk/_source/plugins/flash/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/flash/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/flash/plugin.js (revision 5812)
@@ -91,5 +91,6 @@
editor.contextMenu.addListener( function( element, selection )
{
- if ( element && element.is( 'img' ) && element.getAttribute( '_cke_real_element_type' ) == 'flash' )
+ if ( element && element.is( 'img' ) && !element.isReadOnly()
+ && element.getAttribute( '_cke_real_element_type' ) == 'flash' )
return { flash : CKEDITOR.TRISTATE_OFF };
});
Index: /CKEditor/trunk/_source/plugins/forms/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/forms/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/forms/plugin.js (revision 5812)
@@ -132,5 +132,5 @@
editor.contextMenu.addListener( function( element )
{
- if ( element && element.hasAscendant( 'form', true ) )
+ if ( element && element.hasAscendant( 'form', true ) && !element.isReadOnly() )
return { form : CKEDITOR.TRISTATE_OFF };
});
@@ -138,5 +138,5 @@
editor.contextMenu.addListener( function( element )
{
- if ( element )
+ if ( element && !element.isReadOnly() )
{
var name = element.getName();
Index: /CKEditor/trunk/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/image/dialogs/image.js (revision 5812)
@@ -251,5 +251,8 @@
};
- var numbering = function( id ){ return id + CKEDITOR.tools.getNextNumber(); },
+ var numbering = function( id )
+ {
+ return CKEDITOR.tools.getNextId() + '_' + id;
+ },
btnLockSizesId = numbering( 'btnLockSizes' ),
btnResetSizeId = numbering( 'btnResetSize' ),
Index: /CKEditor/trunk/_source/plugins/image/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/image/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/image/plugin.js (revision 5812)
@@ -54,5 +54,5 @@
editor.contextMenu.addListener( function( element, selection )
{
- if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) )
+ if ( !element || !element.is( 'img' ) || element.getAttribute( '_cke_realelement' ) || element.isReadOnly() )
return null;
Index: /CKEditor/trunk/_source/plugins/indent/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/indent/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/indent/plugin.js (revision 5812)
@@ -54,5 +54,5 @@
else
{
- var indent = parseInt( firstBlock.getStyle( this.indentCssProperty ), 10 );
+ var indent = parseInt( firstBlock.getStyle( getIndentCssProperty( firstBlock ) ), 10 );
if ( isNaN( indent ) )
indent = 0;
@@ -62,185 +62,4 @@
}
}
-
- function indentList( editor, range, listNode )
- {
- // Our starting and ending points of the range might be inside some blocks under a list item...
- // So before playing with the iterator, we need to expand the block to include the list items.
- var startContainer = range.startContainer,
- endContainer = range.endContainer;
- while ( startContainer && !startContainer.getParent().equals( listNode ) )
- startContainer = startContainer.getParent();
- while ( endContainer && !endContainer.getParent().equals( listNode ) )
- endContainer = endContainer.getParent();
-
- if ( !startContainer || !endContainer )
- return;
-
- // Now we can iterate over the individual items on the same tree depth.
- var block = startContainer,
- itemsToMove = [],
- stopFlag = false;
- while ( !stopFlag )
- {
- if ( block.equals( endContainer ) )
- stopFlag = true;
- itemsToMove.push( block );
- block = block.getNext();
- }
- if ( itemsToMove.length < 1 )
- return;
-
- // Do indent or outdent operations on the array model of the list, not the
- // list's DOM tree itself. The array model demands that it knows as much as
- // possible about the surrounding lists, we need to feed it the further
- // ancestor node that is still a list.
- var listParents = listNode.getParents( true );
- for ( var i = 0 ; i < listParents.length ; i++ )
- {
- if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] )
- {
- listNode = listParents[i];
- break;
- }
- }
- var indentOffset = this.name == 'indent' ? 1 : -1,
- startItem = itemsToMove[0],
- lastItem = itemsToMove[ itemsToMove.length - 1 ],
- database = {};
-
- // Convert the list DOM tree into a one dimensional array.
- var listArray = CKEDITOR.plugins.list.listToArray( listNode, database );
-
- // Apply indenting or outdenting on the array.
- var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;
- for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ )
- {
- listArray[ i ].indent += indentOffset;
- // Make sure the newly created sublist get a brand-new element of the same type. (#5372)
- var listRoot = listArray[ i ].parent;
- listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() );
- }
-
- for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
- i < listArray.length && listArray[i].indent > baseIndent ; i++ )
- listArray[i].indent += indentOffset;
-
- // Convert the array back to a DOM forest (yes we might have a few subtrees now).
- // And replace the old list with the new forest.
- var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 );
-
- // Avoid nested
after outdent even they're visually same,
- // recording them for later refactoring.(#3982)
- if ( this.name == 'outdent' )
- {
- var parentLiElement;
- if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )
- {
- var children = newList.listNode.getChildren(),
- pendingLis = [],
- count = children.count(),
- child;
-
- for ( i = count - 1 ; i >= 0 ; i-- )
- {
- if ( ( child = children.getItem( i ) ) && child.is && child.is( 'li' ) )
- pendingLis.push( child );
- }
- }
- }
-
- if ( newList )
- newList.listNode.replace( listNode );
-
- // Move the nested
to be appeared after the parent.
- if ( pendingLis && pendingLis.length )
- {
- for ( i = 0; i < pendingLis.length ; i++ )
- {
- var li = pendingLis[ i ],
- followingList = li;
-
- // Nest preceding
/ inside current
if any.
- while ( ( followingList = followingList.getNext() ) &&
- followingList.is &&
- followingList.getName() in listNodeNames )
- {
- // IE requires a filler NBSP for nested list inside empty list item,
- // otherwise the list item will be inaccessiable. (#4476)
- if ( CKEDITOR.env.ie && !li.getFirst( function( node ){ return isNotWhitespaces( node ) && isNotBookmark( node ); } ) )
- li.append( range.document.createText( '\u00a0' ) );
-
- li.append( followingList );
- }
-
- li.insertAfter( parentLiElement );
- }
- }
-
- // Clean up the markers.
- CKEDITOR.dom.element.clearAllMarkers( database );
- }
-
- function indentBlock( editor, range )
- {
- var iterator = range.createIterator(),
- enterMode = editor.config.enterMode;
- iterator.enforceRealBlocks = true;
- iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
- var block;
- while ( ( block = iterator.getNextParagraph() ) )
- indentElement.call( this, editor, block );
- }
-
- function indentElement( editor, element )
- {
- if ( this.useIndentClasses )
- {
- // Transform current class name to indent step index.
- var indentClass = element.$.className.match( this.classNameRegex ),
- indentStep = 0;
- if ( indentClass )
- {
- indentClass = indentClass[1];
- indentStep = this.indentClassMap[ indentClass ];
- }
-
- // Operate on indent step index, transform indent step index back to class
- // name.
- if ( this.name == 'outdent' )
- indentStep--;
- else
- indentStep++;
-
- if ( indentStep < 0 )
- return false;
-
- indentStep = Math.min( indentStep, editor.config.indentClasses.length );
- indentStep = Math.max( indentStep, 0 );
- var className = CKEDITOR.tools.ltrim( element.$.className.replace( this.classNameRegex, '' ) );
- if ( indentStep < 1 )
- element.$.className = className;
- else
- element.addClass( editor.config.indentClasses[ indentStep - 1 ] );
- }
- else
- {
- var currentOffset = parseInt( element.getStyle( this.indentCssProperty ), 10 );
- if ( isNaN( currentOffset ) )
- currentOffset = 0;
- currentOffset += ( this.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
-
- if ( currentOffset < 0 )
- return false;
-
- currentOffset = Math.max( currentOffset, 0 );
- currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
- element.setStyle( this.indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
- if ( element.getAttribute( 'style' ) === '' )
- element.removeAttribute( 'style' );
- }
-
- return true;
- }
function indentCommand( editor, name )
@@ -255,7 +74,12 @@
this.indentClassMap[ editor.config.indentClasses[i] ] = i + 1;
}
- else
- this.indentCssProperty = editor.config.contentsLangDirection == 'ltr' ? 'margin-left' : 'margin-right';
+
this.startDisabled = name == 'outdent';
+ }
+
+ // Returns the CSS property to be used for identing a given element.
+ function getIndentCssProperty( element )
+ {
+ return element.getComputedStyle( 'direction' ) == 'ltr' ? 'margin-left' : 'margin-right';
}
@@ -268,53 +92,243 @@
exec : function( editor )
{
+ var self = this, database = {};
+
+ function indentList( listNode )
+ {
+ // Our starting and ending points of the range might be inside some blocks under a list item...
+ // So before playing with the iterator, we need to expand the block to include the list items.
+ var startContainer = range.startContainer,
+ endContainer = range.endContainer;
+ while ( startContainer && !startContainer.getParent().equals( listNode ) )
+ startContainer = startContainer.getParent();
+ while ( endContainer && !endContainer.getParent().equals( listNode ) )
+ endContainer = endContainer.getParent();
+
+ if ( !startContainer || !endContainer )
+ return;
+
+ // Now we can iterate over the individual items on the same tree depth.
+ var block = startContainer,
+ itemsToMove = [],
+ stopFlag = false;
+ while ( !stopFlag )
+ {
+ if ( block.equals( endContainer ) )
+ stopFlag = true;
+ itemsToMove.push( block );
+ block = block.getNext();
+ }
+ if ( itemsToMove.length < 1 )
+ return;
+
+ // Do indent or outdent operations on the array model of the list, not the
+ // list's DOM tree itself. The array model demands that it knows as much as
+ // possible about the surrounding lists, we need to feed it the further
+ // ancestor node that is still a list.
+ var listParents = listNode.getParents( true );
+ for ( var i = 0 ; i < listParents.length ; i++ )
+ {
+ if ( listParents[i].getName && listNodeNames[ listParents[i].getName() ] )
+ {
+ listNode = listParents[i];
+ break;
+ }
+ }
+ var indentOffset = self.name == 'indent' ? 1 : -1,
+ startItem = itemsToMove[0],
+ lastItem = itemsToMove[ itemsToMove.length - 1 ];
+
+ // Convert the list DOM tree into a one dimensional array.
+ var listArray = CKEDITOR.plugins.list.listToArray( listNode, database );
+
+ // Apply indenting or outdenting on the array.
+ var baseIndent = listArray[ lastItem.getCustomData( 'listarray_index' ) ].indent;
+ for ( i = startItem.getCustomData( 'listarray_index' ); i <= lastItem.getCustomData( 'listarray_index' ); i++ )
+ {
+ listArray[ i ].indent += indentOffset;
+ // Make sure the newly created sublist get a brand-new element of the same type. (#5372)
+ var listRoot = listArray[ i ].parent;
+ listArray[ i ].parent = new CKEDITOR.dom.element( listRoot.getName(), listRoot.getDocument() );
+ }
+
+ for ( i = lastItem.getCustomData( 'listarray_index' ) + 1 ;
+ i < listArray.length && listArray[i].indent > baseIndent ; i++ )
+ listArray[i].indent += indentOffset;
+
+ // Convert the array back to a DOM forest (yes we might have a few subtrees now).
+ // And replace the old list with the new forest.
+ var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode, 0 );
+
+ // Avoid nested
after outdent even they're visually same,
+ // recording them for later refactoring.(#3982)
+ if ( self.name == 'outdent' )
+ {
+ var parentLiElement;
+ if ( ( parentLiElement = listNode.getParent() ) && parentLiElement.is( 'li' ) )
+ {
+ var children = newList.listNode.getChildren(),
+ pendingLis = [],
+ count = children.count(),
+ child;
+
+ for ( i = count - 1 ; i >= 0 ; i-- )
+ {
+ if ( ( child = children.getItem( i ) ) && child.is && child.is( 'li' ) )
+ pendingLis.push( child );
+ }
+ }
+ }
+
+ if ( newList )
+ newList.listNode.replace( listNode );
+
+ // Move the nested
to be appeared after the parent.
+ if ( pendingLis && pendingLis.length )
+ {
+ for ( i = 0; i < pendingLis.length ; i++ )
+ {
+ var li = pendingLis[ i ],
+ followingList = li;
+
+ // Nest preceding
/ inside current
if any.
+ while ( ( followingList = followingList.getNext() ) &&
+ followingList.is &&
+ followingList.getName() in listNodeNames )
+ {
+ // IE requires a filler NBSP for nested list inside empty list item,
+ // otherwise the list item will be inaccessiable. (#4476)
+ if ( CKEDITOR.env.ie && !li.getFirst( function( node ){ return isNotWhitespaces( node ) && isNotBookmark( node ); } ) )
+ li.append( range.document.createText( '\u00a0' ) );
+
+ li.append( followingList );
+ }
+
+ li.insertAfter( parentLiElement );
+ }
+ }
+ }
+
+ function indentBlock()
+ {
+ var iterator = range.createIterator(),
+ enterMode = editor.config.enterMode;
+ iterator.enforceRealBlocks = true;
+ iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
+ var block;
+ while ( ( block = iterator.getNextParagraph() ) )
+ indentElement( block );
+ }
+
+ function indentElement( element )
+ {
+ if ( element.getCustomData( 'indent_processed' ) )
+ return false;
+
+ if ( self.useIndentClasses )
+ {
+ // Transform current class name to indent step index.
+ var indentClass = element.$.className.match( self.classNameRegex ),
+ indentStep = 0;
+ if ( indentClass )
+ {
+ indentClass = indentClass[1];
+ indentStep = self.indentClassMap[ indentClass ];
+ }
+
+ // Operate on indent step index, transform indent step index back to class
+ // name.
+ if ( self.name == 'outdent' )
+ indentStep--;
+ else
+ indentStep++;
+
+ if ( indentStep < 0 )
+ return false;
+
+ indentStep = Math.min( indentStep, editor.config.indentClasses.length );
+ indentStep = Math.max( indentStep, 0 );
+ var className = CKEDITOR.tools.ltrim( element.$.className.replace( self.classNameRegex, '' ) );
+ if ( indentStep < 1 )
+ element.$.className = className;
+ else
+ element.addClass( editor.config.indentClasses[ indentStep - 1 ] );
+ }
+ else
+ {
+ var indentCssProperty = getIndentCssProperty( element );
+ var currentOffset = parseInt( element.getStyle( indentCssProperty ), 10 );
+ if ( isNaN( currentOffset ) )
+ currentOffset = 0;
+ currentOffset += ( self.name == 'indent' ? 1 : -1 ) * editor.config.indentOffset;
+
+ if ( currentOffset < 0 )
+ return false;
+
+ currentOffset = Math.max( currentOffset, 0 );
+ currentOffset = Math.ceil( currentOffset / editor.config.indentOffset ) * editor.config.indentOffset;
+ element.setStyle( indentCssProperty, currentOffset ? currentOffset + editor.config.indentUnit : '' );
+ if ( element.getAttribute( 'style' ) === '' )
+ element.removeAttribute( 'style' );
+ }
+
+ CKEDITOR.dom.element.setMarker( database, element, 'indent_processed', true );
+ return true;
+ }
+
var selection = editor.getSelection(),
- range = selection && selection.getRanges()[0];
-
- var startContainer = range.startContainer,
- endContainer = range.endContainer,
- rangeRoot = range.getCommonAncestor(),
- nearestListBlock = rangeRoot;
-
- while ( nearestListBlock && !( nearestListBlock.type == CKEDITOR.NODE_ELEMENT &&
- listNodeNames[ nearestListBlock.getName() ] ) )
- nearestListBlock = nearestListBlock.getParent();
-
- // Avoid selection anchors under list root.
- //
[
...
]
=>
[...]
- if ( nearestListBlock && startContainer.type == CKEDITOR.NODE_ELEMENT
- && startContainer.getName() in listNodeNames )
- {
- var walker = new CKEDITOR.dom.walker( range );
- walker.evaluator = isListItem;
- range.startContainer = walker.next();
- }
-
- if ( nearestListBlock && endContainer.type == CKEDITOR.NODE_ELEMENT
- && endContainer.getName() in listNodeNames )
- {
- walker = new CKEDITOR.dom.walker( range );
- walker.evaluator = isListItem;
- range.endContainer = walker.previous();
- }
-
- var bookmarks = selection.createBookmarks( true );
-
- if ( nearestListBlock )
- {
- var firstListItem = nearestListBlock.getFirst( function( node )
- {
- return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
- }),
- rangeStart = range.startContainer,
- indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
-
- // Indent the entire list if cursor is inside the first list item. (#3893)
- if ( !( indentWholeList && indentElement.call( this, editor, nearestListBlock ) ) )
- indentList.call( this, editor, range, nearestListBlock );
- }
- else
- indentBlock.call( this, editor, range );
-
- editor.focus();
+ bookmarks = selection.createBookmarks( true ),
+ ranges = selection && selection.getRanges( true ),
+ range;
+
+ var iterator = ranges.createIterator();
+ while ( ( range = iterator.getNextRange() ) )
+ {
+ var startContainer = range.startContainer,
+ endContainer = range.endContainer,
+ rangeRoot = range.getCommonAncestor(),
+ nearestListBlock = rangeRoot;
+
+ while ( nearestListBlock && !( nearestListBlock.type == CKEDITOR.NODE_ELEMENT &&
+ listNodeNames[ nearestListBlock.getName() ] ) )
+ nearestListBlock = nearestListBlock.getParent();
+
+ // Avoid selection anchors under list root.
+ //
[
...
]
=>
[...]
+ if ( nearestListBlock && startContainer.type == CKEDITOR.NODE_ELEMENT
+ && startContainer.getName() in listNodeNames )
+ {
+ var walker = new CKEDITOR.dom.walker( range );
+ walker.evaluator = isListItem;
+ range.startContainer = walker.next();
+ }
+
+ if ( nearestListBlock && endContainer.type == CKEDITOR.NODE_ELEMENT
+ && endContainer.getName() in listNodeNames )
+ {
+ walker = new CKEDITOR.dom.walker( range );
+ walker.evaluator = isListItem;
+ range.endContainer = walker.previous();
+ }
+
+ if ( nearestListBlock )
+ {
+ var firstListItem = nearestListBlock.getFirst( function( node )
+ {
+ return node.type == CKEDITOR.NODE_ELEMENT && node.is( 'li' );
+ }),
+ rangeStart = range.startContainer,
+ indentWholeList = firstListItem.equals( rangeStart ) || firstListItem.contains( rangeStart );
+
+ // Indent the entire list if cursor is inside the first list item. (#3893)
+ if ( !( indentWholeList && indentElement( nearestListBlock ) ) )
+ indentList( nearestListBlock );
+ }
+ else
+ indentBlock();
+ }
+
+ // Clean up the markers.
+ CKEDITOR.dom.element.clearAllMarkers( database );
+
editor.forceNextSelectionCheck();
selection.selectBookmarks( bookmarks );
Index: /CKEditor/trunk/_source/plugins/justify/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/justify/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/justify/plugin.js (revision 5812)
@@ -10,6 +10,4 @@
(function()
{
- var alignRemoveRegex = /(-moz-|-webkit-|start|auto)/i;
-
function getState( editor, path )
{
@@ -19,8 +17,22 @@
return CKEDITOR.TRISTATE_OFF;
- var currentAlign = firstBlock.getComputedStyle( 'text-align' ).replace( alignRemoveRegex, '' );
- if ( ( !currentAlign && this.isDefaultAlign ) || currentAlign == this.value )
- return CKEDITOR.TRISTATE_ON;
- return CKEDITOR.TRISTATE_OFF;
+ return ( getAlignment( firstBlock, editor.config.useComputedState ) == this.value ) ?
+ CKEDITOR.TRISTATE_ON :
+ CKEDITOR.TRISTATE_OFF;
+ }
+
+ function getAlignment( element, useComputedState )
+ {
+ useComputedState = useComputedState === undefined || useComputedState;
+
+ var align = useComputedState ?
+ element.getComputedStyle( 'text-align' ) :
+ element.getStyle( 'text-align' ) || element.getAttribute( 'align' ) || '';
+
+ align && ( align = align.replace( /-moz-|-webkit-|start|auto/i, '' ) );
+
+ !align && useComputedState && ( align = element.getComputedStyle( 'direction' ) == 'rtl' ? 'right' : 'left' );
+
+ return align;
}
@@ -36,8 +48,4 @@
this.name = name;
this.value = value;
-
- var contentDir = editor.config.contentsLangDirection;
- this.isDefaultAlign = ( value == 'left' && contentDir == 'ltr' ) ||
- ( value == 'right' && contentDir == 'rtl' );
var classes = editor.config.justifyClasses;
@@ -74,10 +82,13 @@
var bookmarks = selection.createBookmarks(),
- ranges = selection.getRanges();
-
+ ranges = selection.getRanges( true );
var cssClassName = this.cssClassName,
iterator,
block;
+
+ var useComputedState = editor.config.useComputedState;
+ useComputedState = useComputedState === undefined || useComputedState;
+
for ( var i = ranges.length - 1 ; i >= 0 ; i-- )
{
@@ -88,24 +99,24 @@
{
block.removeAttribute( 'align' );
+ block.removeStyle( 'text-align' );
+
+ // Remove any of the alignment classes from the className.
+ var className = cssClassName && ( block.$.className =
+ CKEDITOR.tools.ltrim( block.$.className.replace( this.cssClassRegex, '' ) ) );
+
+ var apply =
+ ( this.state == CKEDITOR.TRISTATE_OFF ) &&
+ ( !useComputedState || ( getAlignment( block, true ) != this.value ) );
if ( cssClassName )
{
- // Remove any of the alignment classes from the className.
- var className = block.$.className =
- CKEDITOR.tools.ltrim( block.$.className.replace( this.cssClassRegex, '' ) );
-
// Append the desired class name.
- if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
+ if ( apply )
block.addClass( cssClassName );
else if ( !className )
block.removeAttribute( 'class' );
}
- else
- {
- if ( this.state == CKEDITOR.TRISTATE_OFF && !this.isDefaultAlign )
- block.setStyle( 'text-align', this.value );
- else
- block.removeStyle( 'text-align' );
- }
+ else if ( apply )
+ block.setStyle( 'text-align', this.value );
}
Index: /CKEditor/trunk/_source/plugins/link/dialogs/link.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/link/dialogs/link.js (revision 5812)
@@ -1295,5 +1295,5 @@
// Create element if current selection is collapsed.
var selection = editor.getSelection(),
- ranges = selection.getRanges();
+ ranges = selection.getRanges( true );
if ( ranges.length == 1 && ranges[0].collapsed )
{
Index: /CKEditor/trunk/_source/plugins/link/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/link/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/link/plugin.js (revision 5812)
@@ -59,5 +59,5 @@
*/
var command = editor.getCommand( 'unlink' ),
- element = evt.data.path.lastElement.getAscendant( 'a', true );
+ element = evt.data.path.lastElement && evt.data.path.lastElement.getAscendant( 'a', true );
if ( element && element.getName() == 'a' && element.getAttribute( 'href' ) )
command.setState( CKEDITOR.TRISTATE_OFF );
@@ -111,5 +111,5 @@
editor.contextMenu.addListener( function( element, selection )
{
- if ( !element )
+ if ( !element || element.isReadOnly() )
return null;
@@ -178,10 +178,12 @@
{
var range;
- try { range = editor.getSelection().getRanges()[ 0 ]; }
+ try
+ {
+ range = editor.getSelection().getRanges( true )[ 0 ];
+ range.shrink( CKEDITOR.SHRINK_TEXT );
+ var root = range.getCommonAncestor();
+ return root.getAscendant( 'a', true );
+ }
catch( e ) { return null; }
-
- range.shrink( CKEDITOR.SHRINK_TEXT );
- var root = range.getCommonAncestor();
- return root.getAscendant( 'a', true );
}
};
Index: /CKEditor/trunk/_source/plugins/list/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/list/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/list/plugin.js (revision 5812)
@@ -68,5 +68,5 @@
// Convert our internal representation of a list back to a DOM forest.
- arrayToList : function( listArray, database, baseIndex, paragraphMode )
+ arrayToList : function( listArray, database, baseIndex, paragraphMode, dir )
{
if ( !baseIndex )
@@ -110,6 +110,10 @@
{
// Create completely new blocks here, attributes are dropped.
- if ( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' )
+ if ( dir || ( paragraphMode != CKEDITOR.ENTER_BR && item.grandparent.getName() != 'td' ) )
+ {
currentListItem = doc.createElement( paragraphName );
+ if ( dir )
+ currentListItem.setAttribute( 'dir', dir );
+ }
else
currentListItem = new CKEDITOR.dom.documentFragment( doc );
@@ -287,5 +291,6 @@
// Insert the list to the DOM tree.
var insertAnchor = listContents[ listContents.length - 1 ].getNext(),
- listNode = doc.createElement( this.type );
+ listNode = doc.createElement( this.type ),
+ dir;
listsCreated.push( listNode );
@@ -300,4 +305,9 @@
else
{
+ if ( contentBlock.hasAttribute( 'dir' ) )
+ {
+ dir = dir || contentBlock.getAttribute( 'dir' );
+ contentBlock.removeAttribute( 'dir' );
+ }
contentBlock.copyAttributes( listItem );
contentBlock.moveChildren( listItem );
@@ -311,4 +321,8 @@
listItem.appendBogus();
}
+
+ if ( dir )
+ listNode.setAttribute( 'dir', dir );
+
if ( insertAnchor )
listNode.insertBefore( insertAnchor );
@@ -360,5 +374,6 @@
}
- var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
+ var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode,
+ groupObj.root.getAttribute( 'dir' ) );
// Compensate before/after the list node if the surrounds are non-blocks.(#3836)
@@ -392,5 +407,5 @@
var doc = editor.document,
selection = editor.getSelection(),
- ranges = selection && selection.getRanges();
+ ranges = selection && selection.getRanges( true );
// There should be at least one selected range.
@@ -440,9 +455,20 @@
// or multiple lists have to be cancelled.
var listGroups = [],
- database = {};
-
- while ( ranges.length > 0 )
- {
- range = ranges.shift();
+ database = {},
+ rangeIterator = ranges.createIterator(),
+ index = 0;
+
+ while ( ( range = rangeIterator.getNextRange() ) && ++index )
+ {
+ var boundaryNodes = range.getBoundaryNodes(),
+ startNode = boundaryNodes.startNode,
+ endNode = boundaryNodes.endNode;
+
+ if ( startNode.type == CKEDITOR.NODE_ELEMENT && startNode.getName() == 'td' )
+ range.setStartAt( boundaryNodes.startNode, CKEDITOR.POSITION_AFTER_START );
+
+ if ( endNode.type == CKEDITOR.NODE_ELEMENT && endNode.getName() == 'td' )
+ range.setEndAt( boundaryNodes.endNode, CKEDITOR.POSITION_BEFORE_END );
+
var iterator = range.createIterator(),
block;
@@ -452,4 +478,10 @@
while ( ( block = iterator.getNextParagraph() ) )
{
+ // Avoid duplicate blocks get processed across ranges.
+ if( block.getCustomData( 'list_block' ) )
+ continue;
+ else
+ CKEDITOR.dom.element.setMarker( database, block, 'list_block', 1 );
+
var path = new CKEDITOR.dom.elementPath( block ),
pathElements = path.elements,
@@ -471,5 +503,5 @@
// should belong to a different group of paragraphs before
// the list. (Bug #1309)
- blockLimit.removeCustomData( 'list_group_object' );
+ blockLimit.removeCustomData( 'list_group_object_' + index );
var groupObj = element.getCustomData( 'list_group_object' );
@@ -490,12 +522,12 @@
continue;
- // No list ancestor? Group by block limit.
+ // No list ancestor? Group by block limit, but don't mix contents from different ranges.
var root = blockLimit;
- if ( root.getCustomData( 'list_group_object' ) )
- root.getCustomData( 'list_group_object' ).contents.push( block );
+ if ( root.getCustomData( 'list_group_object_' + index ) )
+ root.getCustomData( 'list_group_object_' + index ).contents.push( block );
else
{
groupObj = { root : root, contents : [ block ] };
- CKEDITOR.dom.element.setMarker( database, root, 'list_group_object', groupObj );
+ CKEDITOR.dom.element.setMarker( database, root, 'list_group_object_' + index, groupObj );
listGroups.push( groupObj );
}
@@ -531,5 +563,5 @@
'getPrevious' : 'getNext' ]( CKEDITOR.dom.walker.whitespaces( true ) );
if ( sibling && sibling.getName &&
- sibling.getName() == listCommand.type )
+ sibling.getName() == listCommand.type )
{
sibling.remove();
Index: /CKEditor/trunk/_source/plugins/liststyle/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/liststyle/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/liststyle/plugin.js (revision 5812)
@@ -44,4 +44,7 @@
editor.contextMenu.addListener( function( element, selection )
{
+ if ( !element || element.isReadOnly() )
+ return null;
+
while ( element )
{
Index: /CKEditor/trunk/_source/plugins/pagebreak/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/pagebreak/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/pagebreak/plugin.js (revision 5812)
@@ -83,13 +83,13 @@
breakObject = editor.createFakeElement( breakObject, 'cke_pagebreak', 'div' );
- var ranges = editor.getSelection().getRanges();
+ var ranges = editor.getSelection().getRanges( true );
editor.fire( 'saveSnapshot' );
- for ( var range, i = 0 ; i < ranges.length ; i++ )
+ for ( var range, i = ranges.length - 1 ; i >= 0; i-- )
{
range = ranges[ i ];
- if ( i > 0 )
+ if ( i < ranges.length -1 )
breakObject = breakObject.clone( true );
Index: /CKEditor/trunk/_source/plugins/removeformat/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/removeformat/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/removeformat/plugin.js (revision 5812)
@@ -36,7 +36,9 @@
var filter = CKEDITOR.plugins.removeformat.filter;
- var ranges = editor.getSelection().getRanges();
+ var ranges = editor.getSelection().getRanges( true ),
+ iterator = ranges.createIterator(),
+ range;
- for ( var i = 0, range ; range = ranges[ i ] ; i++ )
+ while ( ( range = iterator.getNextRange() ) )
{
if ( range.collapsed )
Index: /CKEditor/trunk/_source/plugins/scayt/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/scayt/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/scayt/plugin.js (revision 5812)
@@ -625,7 +625,8 @@
if ( editor.contextMenu && editor.addMenuItems )
{
- editor.contextMenu.addListener( function( )
- {
- if ( !plugin.isScaytEnabled( editor ) )
+ editor.contextMenu.addListener( function( element, selection )
+ {
+ if ( !plugin.isScaytEnabled( editor )
+ || selection.getCommonAncestor().isReadOnly() )
return null;
Index: /CKEditor/trunk/_source/plugins/selection/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/selection/plugin.js (revision 5812)
@@ -526,6 +526,7 @@
* alert(ranges.length);
*/
- getRanges :
- CKEDITOR.env.ie ?
+ getRanges : (function ()
+ {
+ var func = CKEDITOR.env.ie ?
( function()
{
@@ -615,8 +616,4 @@
return function()
{
- var cache = this._.cache;
- if ( cache.ranges )
- return cache.ranges;
-
// IE doesn't have range support (in the W3C way), so we
// need to do some magic to transform selections into
@@ -641,9 +638,9 @@
range.setEnd( new CKEDITOR.dom.node( boundaryInfo.container ), boundaryInfo.offset );
- return ( cache.ranges = [ range ] );
+ return [ range ];
}
else if ( type == CKEDITOR.SELECTION_ELEMENT )
{
- var retval = this._.cache.ranges = [];
+ var retval = [];
for ( var i = 0 ; i < nativeRange.length ; i++ )
@@ -666,5 +663,5 @@
}
- return ( cache.ranges = [] );
+ return [];
};
})()
@@ -672,7 +669,4 @@
function()
{
- var cache = this._.cache;
- if ( cache.ranges )
- return cache.ranges;
// On browsers implementing the W3C range, we simply
@@ -695,7 +689,99 @@
ranges.push( range );
}
-
- return ( cache.ranges = ranges );
- },
+ return ranges;
+ };
+
+ return function( onlyEditables )
+ {
+ var cache = this._.cache;
+ if ( cache.ranges && !onlyEditables )
+ return cache.ranges;
+ else if ( !cache.ranges )
+ cache.ranges = new CKEDITOR.dom.rangeList( func.call( this ) );
+
+ // Split range into multiple by read-only nodes.
+ if ( onlyEditables )
+ {
+ var ranges = cache.ranges;
+ for ( var i = 0; i < ranges.length; i++ )
+ {
+ var range = ranges[ i ];
+
+ // Drop range spans inside one ready-only node.
+ var parent = range.getCommonAncestor();
+ if ( parent.isReadOnly())
+ ranges.splice( i, 1 );
+
+ if ( range.collapsed )
+ continue;
+
+ var startContainer = range.startContainer,
+ endContainer = range.endContainer,
+ startOffset = range.startOffset,
+ endOffset = range.endOffset,
+ walkerRange = range.clone();
+
+ // Range may start inside a non-editable element, restart range
+ // by the end of it.
+ var readOnly;
+ if ( ( readOnly = startContainer.isReadOnly() ) )
+ range.setStartAfter( readOnly );
+
+ // Enlarge range start/end with text node to avoid walker
+ // being DOM destructive, it doesn't interfere our checking
+ // of elements below as well.
+ if ( startContainer && startContainer.type == CKEDITOR.NODE_TEXT )
+ {
+ if ( startOffset >= startContainer.getLength() )
+ walkerRange.setStartAfter( startContainer );
+ else
+ walkerRange.setStartBefore( startContainer );
+ }
+
+ if ( endContainer && endContainer.type == CKEDITOR.NODE_TEXT )
+ {
+ if ( !endOffset )
+ walkerRange.setEndBefore( endContainer );
+ else
+ walkerRange.setEndAfter( endContainer );
+ }
+
+ // Looking for non-editable element inside the range.
+ var walker = new CKEDITOR.dom.walker( walkerRange );
+ walker.evaluator = function( node )
+ {
+ if ( node.type == CKEDITOR.NODE_ELEMENT
+ && node.getAttribute( 'contenteditable' ) == 'false' )
+ {
+ var newRange = range.clone();
+ range.setEndBefore( node );
+
+ // Drop collapsed range around read-only elements,
+ // it make sure the range list empty when selecting
+ // only non-editable elements.
+ if ( range.collapsed )
+ ranges.splice( i--, 1 );
+
+ // Avoid creating invalid range.
+ if ( !( node.getPosition( walkerRange.endContainer ) & CKEDITOR.POSITION_CONTAINS ) )
+ {
+ newRange.setStartAfter( node );
+ if ( !newRange.collapsed )
+ ranges.splice( i + 1, 0, newRange );
+ }
+
+ return true;
+ }
+
+ return false;
+ };
+
+ walker.next();
+ }
+ }
+
+ return cache.ranges;
+ };
+ })(),
/**
@@ -901,5 +987,5 @@
this._.cache.selectedElement = element;
this._.cache.startElement = element;
- this._.cache.ranges = [ range ];
+ this._.cache.ranges = new CKEDITOR.dom.rangeList( range );
this._.cache.type = CKEDITOR.SELECTION_ELEMENT;
@@ -957,6 +1043,6 @@
{
this._.cache.selectedElement = null;
- this._.cache.startElement = ranges[ 0 ].getTouchedStartNode();
- this._.cache.ranges = ranges;
+ this._.cache.startElement = ranges[ 0 ] && ranges[ 0 ].getTouchedStartNode();
+ this._.cache.ranges = new CKEDITOR.dom.rangeList( ranges );
this._.cache.type = CKEDITOR.SELECTION_TEXT;
@@ -966,6 +1052,12 @@
if ( CKEDITOR.env.ie )
{
- // IE doesn't accept multiple ranges selection, so we just
- // select the first one.
+ if ( ranges.length > 1 )
+ {
+ // IE doesn't accept multiple ranges selection, so we join all into one.
+ var last = ranges[ ranges.length -1 ] ;
+ ranges[ 0 ].setEnd( last.endContainer, last.endOffset );
+ ranges.length = 1;
+ }
+
if ( ranges[ 0 ] )
ranges[ 0 ].select();
@@ -976,8 +1068,33 @@
{
var sel = this.getNative();
- sel.removeAllRanges();
+
+ if ( ranges.length )
+ sel.removeAllRanges();
for ( var i = 0 ; i < ranges.length ; i++ )
{
+ // Joining sequential ranges introduced by
+ // readonly elements protection.
+ if ( i < ranges.length -1 )
+ {
+ var left = ranges[ i ], right = ranges[ i +1 ],
+ between = left.clone();
+ between.setStart( left.endContainer, left.endOffset );
+ between.setEnd( right.startContainer, right.startOffset );
+
+ // Don't confused by Firefox adjancent multi-ranges
+ // introduced by table cells selection.
+ if ( !between.collapsed )
+ {
+ between.shrink( CKEDITOR.NODE_ELEMENT, true );
+ if ( between.getCommonAncestor().isReadOnly())
+ {
+ right.setStart( left.startContainer, left.startOffset );
+ ranges.splice( i--, 1 );
+ continue;
+ }
+ }
+ }
+
var range = ranges[ i ];
var nativeRange = this.document.$.createRange();
@@ -1014,32 +1131,5 @@
createBookmarks : function( serializable )
{
- var retval = [],
- ranges = this.getRanges(),
- length = ranges.length,
- bookmark;
- for ( var i = 0; i < length ; i++ )
- {
- retval.push( bookmark = ranges[ i ].createBookmark( serializable, true ) );
-
- serializable = bookmark.serializable;
-
- var bookmarkStart = serializable ? this.document.getById( bookmark.startNode ) : bookmark.startNode,
- bookmarkEnd = serializable ? this.document.getById( bookmark.endNode ) : bookmark.endNode;
-
- // Updating the offset values for rest of ranges which have been mangled(#3256).
- for ( var j = i + 1 ; j < length ; j++ )
- {
- var dirtyRange = ranges[ j ],
- rangeStart = dirtyRange.startContainer,
- rangeEnd = dirtyRange.endContainer;
-
- rangeStart.equals( bookmarkStart.getParent() ) && dirtyRange.startOffset++;
- rangeStart.equals( bookmarkEnd.getParent() ) && dirtyRange.startOffset++;
- rangeEnd.equals( bookmarkStart.getParent() ) && dirtyRange.endOffset++;
- rangeEnd.equals( bookmarkEnd.getParent() ) && dirtyRange.endOffset++;
- }
- }
-
- return retval;
+ return this.getRanges().createBookmarks( serializable );
},
@@ -1052,11 +1142,5 @@
createBookmarks2 : function( normalized )
{
- var bookmarks = [],
- ranges = this.getRanges();
-
- for ( var i = 0 ; i < ranges.length ; i++ )
- bookmarks.push( ranges[i].createBookmark2( normalized ) );
-
- return bookmarks;
+ return this.getRanges().createBookmarks2( normalized );
},
Index: /CKEditor/trunk/_source/plugins/showborders/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/showborders/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/showborders/plugin.js (revision 5812)
@@ -162,4 +162,30 @@
};
} );
+
+ var advTab = dialogDefinition.getContents( 'advanced' ),
+ classField = advTab && advTab.get( 'advCSSClasses' );
+
+ if ( classField )
+ {
+ classField.setup = CKEDITOR.tools.override( classField.setup, function( originalSetup )
+ {
+ return function()
+ {
+ originalSetup.apply( this, arguments );
+ this.setValue( this.getValue().replace( /cke_show_border/, '' ) );
+ };
+ });
+
+ classField.commit = CKEDITOR.tools.override( classField.commit, function( originalCommit )
+ {
+ return function( data, element )
+ {
+ originalCommit.apply( this, arguments );
+
+ if ( !parseInt( element.getAttribute( 'border' ), 10 ) )
+ element.addClass( 'cke_show_border' );
+ };
+ });
+ }
}
});
Index: /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js
===================================================================
--- /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/smiley/dialogs/smiley.js (revision 5812)
@@ -132,5 +132,5 @@
// Build the HTML for the smiley images table.
- var labelId = 'smiley_emtions_label' + CKEDITOR.tools.getNextNumber();
+ var labelId = CKEDITOR.tools.getNextId() + '_smiley_emtions_label';
var html =
[
Index: /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js
===================================================================
--- /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/specialchar/dialogs/specialchar.js (revision 5812)
@@ -16,20 +16,23 @@
{
var selection = editor.getSelection(),
- ranges = selection.getRanges(),
+ ranges = selection.getRanges( true ),
range, textNode;
editor.fire( 'saveSnapshot' );
- for ( var i = 0, len = ranges.length ; i < len ; i++ )
+ for ( var i = ranges.length - 1; i >= 0 ; i-- )
{
range = ranges[ i ];
range.deleteContents();
- textNode = CKEDITOR.dom.element.createFromHtml( specialChar );
+ textNode = CKEDITOR.dom.element.createFromHtml( specialChar );
range.insertNode( textNode );
}
- range.moveToPosition( textNode, CKEDITOR.POSITION_AFTER_END );
- range.select();
+ if ( range )
+ {
+ range.moveToPosition( textNode, CKEDITOR.POSITION_AFTER_END );
+ range.select();
+ }
editor.fire( 'saveSnapshot' );
@@ -263,5 +266,5 @@
chars = this.definition.chars;
- var charsTableLabel = 'specialchar_table_label' + CKEDITOR.tools.getNextNumber();
+ var charsTableLabel = CKEDITOR.tools.getNextId() + '_specialchar_table_label';
var html = [ '
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;
+ */
+
+// If the TAB key is not supposed to be enabled for navigation, the following
+// settings could be used alternatively:
+// config.keystrokes.push(
+// [ CKEDITOR.ALT + 38 /*Arrow Up*/, 'selectPreviousCell' ],
+// [ CKEDITOR.ALT + 40 /*Arrow Down*/, 'selectNextCell' ]
+// );
Index: /CKEditor/trunk/_source/plugins/table/dialogs/table.js
===================================================================
--- /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/table/dialogs/table.js (revision 5812)
@@ -19,5 +19,10 @@
function tableDialog( editor, command )
{
- var makeElement = function( name ){ return new CKEDITOR.dom.element( name, editor.document ); };
+ var makeElement = function( name )
+ {
+ return new CKEDITOR.dom.element( name, editor.document );
+ };
+
+ var dialogadvtab = editor.plugins.dialogadvtab;
return {
@@ -25,4 +30,49 @@
minWidth : 310,
minHeight : CKEDITOR.env.ie ? 310 : 280,
+
+ onLoad : function()
+ {
+ var dialog = this,
+ isUpdating;
+
+ var styles = dialog.getContentElement( 'advanced', 'advStyles' );
+
+ if ( styles )
+ {
+ styles.on( 'change', function( evt )
+ {
+ if ( isUpdating )
+ return;
+
+ // Flag to avoid recursion.
+ isUpdating = 1;
+
+ // Synchronize width value.
+ var width = this.getStyle( 'width', '' ),
+ txtWidth = dialog.getContentElement( 'info', 'txtWidth' ),
+ cmbWidthType = dialog.getContentElement( 'info', 'cmbWidthType' ),
+ isPx = 1;
+
+ if ( width )
+ {
+ isPx = ( width.length < 3 || width.substr( width.length - 1 ) != '%' );
+ width = parseInt( width, 10 );
+ }
+
+ txtWidth && txtWidth.setValue( width );
+ cmbWidthType && cmbWidthType.setValue( isPx ? 'pixels' : 'percents' );
+
+ // Synchronize height value.
+ var height = this.getStyle( 'height', '' ),
+ txtHeight = dialog.getContentElement( 'info', 'txtHeight' );
+
+ height && ( height = parseInt( height, 10 ) );
+ txtHeight && txtHeight.setValue( height );
+
+ isUpdating = 0;
+ });
+ }
+ },
+
onShow : function()
{
@@ -34,5 +84,7 @@
var rowsInput = this.getContentElement( 'info', 'txtRows' ),
colsInput = this.getContentElement( 'info', 'txtCols' ),
- widthInput = this.getContentElement( 'info', 'txtWidth' );
+ widthInput = this.getContentElement( 'info', 'txtWidth' ),
+ heightInput = this.getContentElement( 'info', 'txtHeight' );
+
if ( command == 'tableProperties' )
{
@@ -71,4 +123,9 @@
rowsInput && rowsInput.select();
}
+
+ // Call the onChange method for the widht and height fields so
+ // they get reflected into the Advanced tab.
+ widthInput && widthInput.onChange();
+ heightInput && heightInput.onChange();
},
onOk : function()
@@ -381,5 +438,5 @@
style : 'width:5em',
label : editor.lang.table.width,
- 'default' : 200,
+ 'default' : 500,
validate : CKEDITOR.dialog.validate['number']( editor.lang.table.invalidWidth ),
@@ -393,4 +450,19 @@
inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );
+ },
+
+ onChange : function()
+ {
+ var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' );
+
+ if ( styles )
+ {
+ var value = this.getValue();
+
+ if ( value )
+ value += this.getDialog().getContentElement( 'info', 'cmbWidthType' ).getValue() == 'percents' ? '%' : 'px';
+
+ styles.updateStyle( 'width', value );
+ }
},
@@ -422,4 +494,8 @@
this.setValue( widthMatch[2] == 'px' ? 'pixels' : 'percents' );
},
+ onChange : function()
+ {
+ this.getDialog().getContentElement( 'info', 'txtWidth' ).onChange();
+ },
commit : commitValue
}
@@ -448,4 +524,15 @@
inputElement.setAttribute( 'aria-labelledby', [ ariaLabelledByAttr, labelElement.$.id ].join( ' ' ) );
+ },
+
+ onChange : function()
+ {
+ var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' );
+
+ if ( styles )
+ {
+ var value = this.getValue();
+ styles.updateStyle( 'height', value && ( value + 'px' ) );
+ }
},
@@ -583,5 +670,6 @@
}
]
- }
+ },
+ dialogadvtab && dialogadvtab.createAdvancedTab( editor )
]
};
Index: /CKEditor/trunk/_source/plugins/table/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/table/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/table/plugin.js (revision 5812)
@@ -59,5 +59,5 @@
editor.contextMenu.addListener( function( element, selection )
{
- if ( !element )
+ if ( !element || element.isReadOnly())
return null;
Index: /CKEditor/trunk/_source/plugins/tableresize/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/tableresize/plugin.js (revision 5812)
+++ /CKEditor/trunk/_source/plugins/tableresize/plugin.js (revision 5812)
@@ -0,0 +1,450 @@
+/*
+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,
+ needsIEHacks = CKEDITOR.env.ie && ( CKEDITOR.env.ie7Compat || CKEDITOR.env.quirks || CKEDITOR.env.version < 7 );
+
+ function getWidth( el )
+ {
+ return CKEDITOR.env.ie ? el.$.clientWidth : parseInt( el.getComputedStyle( 'width' ), 10 );
+ }
+
+ function getBorderWidth( element, side )
+ {
+ var computed = element.getComputedStyle( 'border-' + side + '-width' ),
+ borderMap =
+ {
+ thin: '0px',
+ medium: '1px',
+ thick: '2px'
+ };
+
+ if ( computed.indexOf( 'px' ) < 0 )
+ {
+ // look up keywords
+ if ( computed in borderMap && element.getComputedStyle( 'border-style' ) != 'none' )
+ computed = borderMap[ computed ];
+ else
+ computed = 0;
+ }
+
+ return parseInt( computed, 10 );
+ }
+
+ // Gets the table row that contains the most columns.
+ function getMasterPillarRow( table )
+ {
+ var $rows = table.$.rows,
+ maxCells = 0, cellsCount,
+ $elected, $tr;
+
+ for ( var i = 0, len = $rows.length ; i < len; i++ )
+ {
+ $tr = $rows[ i ];
+ cellsCount = $tr.cells.length;
+
+ if ( cellsCount > maxCells )
+ {
+ maxCells = cellsCount;
+ $elected = $tr;
+ }
+ }
+
+ return $elected;
+ }
+
+ function buildTableColumnPillars( table )
+ {
+ var pillars = [],
+ pillarIndex = -1,
+ rtl = ( table.getComputedStyle( 'direction' ) == 'rtl' );
+
+ // Get the raw row element that cointains the most columns.
+ var $tr = getMasterPillarRow( table );
+
+ // Get the tbody element and position, which will be used to set the
+ // top and bottom boundaries.
+ var tbody = new CKEDITOR.dom.element( table.$.tBodies[ 0 ] ),
+ tbodyPosition = tbody.getDocumentPosition();
+
+ // Loop thorugh all cells, building pillars after each one of them.
+ for ( var i = 0, len = $tr.cells.length ; i < len ; i++ )
+ {
+ // Both the current cell and the successive one will be used in the
+ // pillar size calculation.
+ var td = new CKEDITOR.dom.element( $tr.cells[ i ] ),
+ nextTd = $tr.cells[ i + 1 ] && new CKEDITOR.dom.element( $tr.cells[ i + 1 ] );
+
+ pillarIndex += td.$.colSpan || 1;
+
+ // Calculate the pillar boundary positions.
+ var pillarLeft, pillarRight, pillarWidth, pillarPadding;
+
+ var x = td.getDocumentPosition().x;
+
+ // Calculate positions based on the current cell.
+ rtl ?
+ pillarRight = x + getBorderWidth( td, 'left' ) :
+ pillarLeft = x + td.$.offsetWidth - getBorderWidth( td, 'right' );
+
+ // Calculate positions based on the next cell, if available.
+ if ( nextTd )
+ {
+ x = nextTd.getDocumentPosition().x;
+
+ rtl ?
+ pillarLeft = x + nextTd.$.offsetWidth - getBorderWidth( nextTd, 'right' ) :
+ pillarRight = x + getBorderWidth( nextTd, 'left' );
+ }
+ // Otherwise calculate positions based on the table (for last cell).
+ else
+ {
+ x = table.getDocumentPosition().x;
+
+ rtl ?
+ pillarLeft = x :
+ pillarRight = x + table.$.offsetWidth;
+ }
+
+ pillarWidth = Math.max( pillarRight - pillarLeft, 3 );
+
+ // Make the pillar touch area at least 14 pixels wide, for easy to use.
+ pillarPadding = Math.max( Math.round( 7 - ( pillarWidth / 2 ) ), 0 );
+
+ // The pillar should reflects exactly the shape of the hovered
+ // column border line.
+ pillars.push( {
+ table : table,
+ index : pillarIndex,
+ x : pillarLeft,
+ y : tbodyPosition.y,
+ width : pillarWidth,
+ height: tbody.$.offsetHeight,
+ padding : pillarPadding,
+ rtl : rtl } );
+ }
+
+ return pillars;
+ }
+
+ function getPillarAtPosition( pillars, positionX )
+ {
+ for ( var i = 0, len = pillars.length ; i < len ; i++ )
+ {
+ var pillar = pillars[ i ],
+ pad = pillar.padding;
+
+ if ( positionX >= pillar.x - pad && positionX <= ( pillar.x + pillar.width + pad ) )
+ return pillar;
+ }
+
+ return null;
+ }
+
+ function cancel( evt )
+ {
+ ( evt.data || evt ).preventDefault();
+ }
+
+ function columnResizer( editor )
+ {
+ var pillar,
+ document,
+ resizer,
+ isResizing,
+ startOffset,
+ currentShift;
+
+ var leftSideCells, rightSideCells, leftShiftBoundary, rightShiftBoundary;
+
+ function detach()
+ {
+ pillar = null;
+ currentShift = 0;
+ isResizing = 0;
+
+ document.removeListener( 'mouseup', onMouseUp );
+ resizer.removeListener( 'mousedown', onMouseDown );
+ resizer.removeListener( 'mousemove', onMouseMove );
+
+ document.getBody().setStyle( 'cursor', 'auto' );
+
+ // Hide the resizer (remove it on IE7 - #5890).
+ needsIEHacks ? resizer.remove() : 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,
+ rtl = pillar.rtl;
+
+ for ( var i = 0, len = map.length ; i < len ; i++ )
+ {
+ var row = map[ i ],
+ leftCell = row[ columnIndex + ( rtl ? 1 : 0 ) ],
+ rightCell = row[ columnIndex + ( rtl ? 0 : 1 ) ];
+
+ leftCell = leftCell && new CKEDITOR.dom.element( leftCell );
+ rightCell = rightCell && new CKEDITOR.dom.element( rightCell );
+
+ if ( !leftCell || !rightCell || !leftCell.equals( rightCell ) )
+ {
+ leftCell && ( leftMinSize = Math.min( leftMinSize, getWidth( leftCell ) ) );
+ rightCell && ( rightMinSize = Math.min( rightMinSize, getWidth( rightCell ) ) );
+
+ leftColumnCells.push( leftCell );
+ rightColumnCells.push( rightCell );
+ }
+ }
+
+ // Cache the list of cells to be resized.
+ leftSideCells = leftColumnCells;
+ rightSideCells = rightColumnCells;
+
+ // Cache the resize limit boundaries.
+ leftShiftBoundary = pillar.x - leftMinSize;
+ rightShiftBoundary = pillar.x + rightMinSize;
+
+ resizer.setOpacity( 0.5 );
+ startOffset = parseInt( resizer.getStyle( 'left' ), 10 );
+ currentShift = 0;
+ isResizing = 1;
+
+ resizer.on( 'mousemove', onMouseMove );
+
+ // Prevent the native drag behavior otherwise 'mousemove' won't fire.
+ document.on( 'dragstart', cancel );
+ }
+
+ function resizeEnd()
+ {
+ isResizing = 0;
+
+ resizer.setOpacity( 0 );
+
+ currentShift && resizeColumn();
+
+ var table = pillar.table;
+ setTimeout( function () { table.removeCustomData( '_cke_table_pillars' ); }, 0 );
+
+ document.removeListener( 'dragstart', cancel );
+ }
+
+ function resizeColumn()
+ {
+ var rtl = pillar.rtl,
+ cellsCount = rtl ? rightSideCells.length : leftSideCells.length;
+
+ // Perform the actual resize to table cells, only for those by side of the pillar.
+ for ( var i = 0 ; i < cellsCount ; i++ )
+ {
+ var leftCell = leftSideCells[ i ],
+ rightCell = rightSideCells[ i ],
+ table = pillar.table;
+
+ // Defer the resizing to avoid any interference among cells.
+ CKEDITOR.tools.setTimeout(
+ function( leftCell, leftOldWidth, rightCell, rightOldWidth, tableWidth, sizeShift )
+ {
+ leftCell && leftCell.setStyle( 'width', pxUnit( Math.max( leftOldWidth + sizeShift, 0 ) ) );
+ rightCell && rightCell.setStyle( 'width', pxUnit( Math.max( rightOldWidth - sizeShift, 0 ) ) );
+
+ // If we're in the last cell, we need to resize the table as well
+ if ( tableWidth )
+ table.setStyle( 'width', pxUnit( tableWidth + sizeShift * ( rtl ? -1 : 1 ) ) );
+ }
+ , 0,
+ this, [
+ leftCell, leftCell && getWidth( leftCell ),
+ rightCell, rightCell && getWidth( rightCell ),
+ ( !leftCell || !rightCell ) && ( getWidth( table ) + getBorderWidth( table, 'left' ) + getBorderWidth( table, 'right' ) ),
+ currentShift ] );
+ }
+ }
+
+ function onMouseDown( evt )
+ {
+ cancel( evt );
+
+ resizeStart();
+
+ document.on( 'mouseup', onMouseUp, this );
+ }
+
+ function onMouseUp( evt )
+ {
+ evt.removeListener();
+
+ resizeEnd();
+ }
+
+ function onMouseMove( evt )
+ {
+ move( evt.data.$.clientX );
+ }
+
+ document = editor.document;
+
+ resizer = CKEDITOR.dom.element.createFromHtml(
+ '', document );
+
+ // Except on IE6/7 (#5890), place the resizer after body to prevent it
+ // from being editable.
+ if ( !needsIEHacks )
+ document.getDocumentElement().append( resizer );
+
+ this.attachTo = function( targetPillar )
+ {
+ // Accept only one pillar at a time.
+ if ( isResizing )
+ return;
+
+ // On IE6/7, we append the resizer everytime we need it. (#5890)
+ if ( needsIEHacks )
+ {
+ document.getBody().append( resizer );
+ currentShift = 0;
+ }
+
+ pillar = targetPillar;
+
+ resizer.setStyles(
+ {
+ width: pxUnit( targetPillar.width ),
+ height : pxUnit( targetPillar.height ),
+ left : pxUnit( targetPillar.x ),
+ top : pxUnit( targetPillar.y )
+ });
+
+ // In IE6/7, it's not possible to have custom cursors for floating
+ // elements in an editable document. Show the resizer in that case,
+ // to give the user a visual clue.
+ needsIEHacks && resizer.setOpacity( 0.25 );
+
+ resizer.on( 'mousedown', onMouseDown, this );
+
+ document.getBody().setStyle( 'cursor', 'col-resize' );
+
+ // Display the resizer to receive events but don't show it,
+ // only change the cursor to resizable shape.
+ resizer.show();
+ };
+
+ var move = this.move = function( posX )
+ {
+ if ( !pillar )
+ return 0;
+
+ var pad = pillar.padding;
+
+ if ( !isResizing && ( posX < pillar.x - pad || posX > ( pillar.x + pillar.width + pad ) ) )
+ {
+ detach();
+ return 0;
+ }
+
+ var resizerNewPosition = posX - Math.round( resizer.$.offsetWidth / 2 );
+
+ if ( isResizing )
+ {
+ if ( resizerNewPosition == leftShiftBoundary || resizerNewPosition == rightShiftBoundary )
+ return 1;
+
+ resizerNewPosition = Math.max( resizerNewPosition, leftShiftBoundary );
+ resizerNewPosition = Math.min( resizerNewPosition, rightShiftBoundary );
+
+ currentShift = resizerNewPosition - startOffset;
+ }
+
+ resizer.setStyle( 'left', pxUnit( resizerNewPosition ) );
+
+ return 1;
+ };
+ }
+
+ 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.$ && !dest.equals( target ) && !dest.is( 'body' ) )
+ dest = dest.getParent();
+ if ( !dest || dest.equals( target ) )
+ return;
+ }
+
+ target.getAscendant( 'table', true ).removeCustomData( '_cke_table_pillars' );
+ 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;
+
+ // If we're already attached to a pillar, simply move the
+ // resizer.
+ if ( resizer && resizer.move( evt.$.clientX ) )
+ {
+ cancel( evt );
+ return;
+ }
+
+ // Considering table, tr, td, tbody but nothing else.
+ var target = evt.getTarget(),
+ table,
+ pillars;
+
+ if ( !target.is( 'table' ) && !target.getAscendant( 'tbody', true ) )
+ return;
+
+ table = target.getAscendant( 'table', true );
+
+ if ( !( pillars = table.getCustomData( '_cke_table_pillars' ) ) )
+ {
+ // Cache table pillars calculation result.
+ table.setCustomData( '_cke_table_pillars', ( pillars = buildTableColumnPillars( table ) ) );
+ table.on( 'mouseout', clearPillarsCache );
+ table.on( 'mousedown', clearPillarsCache );
+ }
+
+ var pillar = getPillarAtPosition( pillars, evt.$.clientX );
+ if ( pillar )
+ {
+ !resizer && ( resizer = new columnResizer( editor ) );
+ resizer.attachTo( pillar );
+ }
+ });
+ });
+ }
+ });
+
+})();
Index: /CKEditor/trunk/_source/plugins/tabletools/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/tabletools/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/tabletools/plugin.js (revision 5812)
@@ -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 ),
@@ -1089,5 +1044,5 @@
editor.contextMenu.addListener( function( element, selection )
{
- if ( !element )
+ if ( !element || element.isReadOnly() )
return null;
@@ -1115,2 +1070,51 @@
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/trunk/_source/plugins/toolbar/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/toolbar/plugin.js (revision 5812)
@@ -434,4 +434,5 @@
['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
+ ['BidiLtr', 'BidiRtl'],
['Link','Unlink','Anchor'],
['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak'],
Index: /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 5811)
+++ /CKEditor/trunk/_source/plugins/wysiwygarea/plugin.js (revision 5812)
@@ -19,4 +19,12 @@
var notWhitespaceEval = CKEDITOR.dom.walker.whitespaces( true );
+ function checkReadOnly( selection )
+ {
+ if ( selection.getType() == CKEDITOR.SELECTION_ELEMENT )
+ return selection.getSelectedElement().isReadOnly();
+ else
+ return selection.getCommonAncestor().isReadOnly();
+ }
+
function onInsertHtml( evt )
{
@@ -24,8 +32,11 @@
{
this.focus();
+
+ var selection = this.getSelection();
+ if ( checkReadOnly( selection ) )
+ return;
+
+ var data = evt.data;
this.fire( 'saveSnapshot' );
-
- var selection = this.getSelection(),
- data = evt.data;
if ( this.dataProcessor )
@@ -40,6 +51,27 @@
var $sel = selection.getNative();
+
+ // Delete control selections to avoid IE bugs on pasteHTML.
if ( $sel.type == 'Control' )
$sel.clear();
+ else if ( selection.getType() == CKEDITOR.SELECTION_TEXT )
+ {
+ // Due to IE bugs on handling contenteditable=false blocks
+ // (#6005), we need to make some checks and eventually
+ // delete the selection first.
+
+ var range = selection.getRanges()[0],
+ endContainer = range && range.endContainer;
+
+ if ( endContainer &&
+ endContainer.type == CKEDITOR.NODE_ELEMENT &&
+ endContainer.getAttribute( 'contenteditable' ) == 'false' &&
+ range.checkBoundaryOfElement( endContainer, CKEDITOR.END ) )
+ {
+ range.setEndAfter( range.endContainer );
+ range.deleteContents();
+ }
+ }
+
$sel.createRange().pasteHTML( data );
@@ -71,12 +103,15 @@
{
this.focus();
+
+ var selection = this.getSelection();
+ if ( checkReadOnly( selection ) )
+ return;
+
this.fire( 'saveSnapshot' );
- var element = evt.data,
+ var ranges = selection.getRanges(),
+ element = evt.data,
elementName = element.getName(),
isBlock = CKEDITOR.dtd.$block[ elementName ];
-
- var selection = this.getSelection(),
- ranges = selection.getRanges();
var selIsLocked = selection.isLocked;
@@ -378,4 +413,8 @@
'>' );
+ // #5689 Running inside of Firefox chrome the load event doesn't bubble like in a normal page
+ if (document.location.protocol == 'chrome:')
+ CKEDITOR.event.useCapture = true;
+
// With FF, it's better to load the data on iframe.load. (#3894,#4058)
iframe.on( 'load', function( ev )
@@ -391,4 +430,8 @@
doc.close();
});
+
+ // #5689 Reset adjustment back to default
+ if (document.location.protocol == 'chrome:')
+ CKEDITOR.event.useCapture = false;
mainElement.append( iframe );
@@ -493,4 +536,12 @@
} );
}
+
+ // Prevent the browser opening links in read-only blocks. (#6032)
+ domDocument.on( 'click', function( ev )
+ {
+ ev = ev.data;
+ if ( ev.getTarget().is( 'a' ) && ev.$.button != 2 )
+ ev.preventDefault();
+ });
// Webkit: avoid from editing form control elements content.
@@ -934,5 +985,11 @@
&& ( element.is( 'input' ) || element.is( 'textarea' ) ) )
{
- element.setAttribute( 'contentEditable', false );
+ if ( !element.isReadOnly() )
+ {
+ element.setAttribute( 'contentEditable', false );
+ // We should flag that the element was locked by our code so
+ // it'll be editable by the editor functions (#6046).
+ element.setCustomData( '_cke_notReadOnly', 1 );
+ }
}
});
Index: /CKEditor/trunk/_source/skins/kama/dialog.css
===================================================================
--- /CKEditor/trunk/_source/skins/kama/dialog.css (revision 5811)
+++ /CKEditor/trunk/_source/skins/kama/dialog.css (revision 5812)
@@ -611,5 +611,5 @@
}
-.cke_skin_kama iframe.cke_dialog_ui_input_file
+.cke_skin_kama .cke_dialog_ui_input_file
{
width: 100%;
Index: /CKEditor/trunk/_source/skins/kama/icons.css
===================================================================
--- /CKEditor/trunk/_source/skins/kama/icons.css (revision 5811)
+++ /CKEditor/trunk/_source/skins/kama/icons.css (revision 5812)
@@ -321,6 +321,17 @@
background-position: 0 -1040px;
}
-.cke_skin_office2003 .cke_button_editdiv .cke_icon
+
+.cke_skin_kama .cke_button_editdiv .cke_icon
{
background-position: 0 -1184px;
}
+
+.cke_skin_kama .cke_button_bidirtl .cke_icon
+{
+ background-position: 0 -1072px;
+}
+
+.cke_skin_kama .cke_button_bidiltr .cke_icon
+{
+ background-position: 0 -1056px;
+}
Index: /CKEditor/trunk/_source/skins/office2003/dialog.css
===================================================================
--- /CKEditor/trunk/_source/skins/office2003/dialog.css (revision 5811)
+++ /CKEditor/trunk/_source/skins/office2003/dialog.css (revision 5812)
@@ -542,5 +542,5 @@
}
-.cke_skin_office2003 iframe.cke_dialog_ui_input_file
+.cke_skin_office2003 .cke_dialog_ui_input_file
{
width: 100%;
Index: /CKEditor/trunk/_source/skins/office2003/icons.css
===================================================================
--- /CKEditor/trunk/_source/skins/office2003/icons.css (revision 5811)
+++ /CKEditor/trunk/_source/skins/office2003/icons.css (revision 5812)
@@ -323,2 +323,12 @@
background-position: 0 -1200px;
}
+
+.cke_skin_office2003 .cke_button_bidirtl .cke_icon
+{
+ background-position: 0 -1072px;
+}
+
+.cke_skin_office2003 .cke_button_bidiltr .cke_icon
+{
+ background-position: 0 -1056px;
+}
Index: /CKEditor/trunk/_source/skins/v2/dialog.css
===================================================================
--- /CKEditor/trunk/_source/skins/v2/dialog.css (revision 5811)
+++ /CKEditor/trunk/_source/skins/v2/dialog.css (revision 5812)
@@ -544,5 +544,5 @@
}
-.cke_skin_v2 iframe.cke_dialog_ui_input_file
+.cke_skin_v2 .cke_dialog_ui_input_file
{
width: 100%;
Index: /CKEditor/trunk/_source/skins/v2/icons.css
===================================================================
--- /CKEditor/trunk/_source/skins/v2/icons.css (revision 5811)
+++ /CKEditor/trunk/_source/skins/v2/icons.css (revision 5812)
@@ -323,2 +323,12 @@
background-position: 0 -1200px;
}
+
+.cke_skin_v2 .cke_button_bidirtl .cke_icon
+{
+ background-position: 0 -1072px;
+}
+
+.cke_skin_v2 .cke_button_bidiltr .cke_icon
+{
+ background-position: 0 -1056px;
+}
Index: /CKEditor/trunk/ckeditor.pack
===================================================================
--- /CKEditor/trunk/ckeditor.pack (revision 5811)
+++ /CKEditor/trunk/ckeditor.pack (revision 5812)
@@ -130,4 +130,5 @@
'_source/core/dom/walker.js',
'_source/core/dom/range.js',
+ '_source/core/dom/rangelist.js',
'_source/core/_bootstrap.js',
'_source/skins/kama/skin.js',
@@ -136,4 +137,5 @@
'_source/plugins/a11yhelp/plugin.js',
'_source/plugins/basicstyles/plugin.js',
+ '_source/plugins/bidi/plugin.js',
'_source/plugins/blockquote/plugin.js',
'_source/plugins/button/plugin.js',
@@ -142,4 +144,5 @@
'_source/plugins/colordialog/plugin.js',
'_source/plugins/contextmenu/plugin.js',
+ '_source/plugins/dialogadvtab/plugin.js',
'_source/plugins/div/plugin.js',
'_source/plugins/elementspath/plugin.js',