\r
(function()\r
{\r
- var guardElements = { table:1, ul:1, ol:1, blockquote:1, div:1 };\r
- var directSelectionGuardElements = {};\r
+ var guardElements = { table:1, tbody: 1, ul:1, ol:1, blockquote:1, div:1, tr: 1 },\r
+ directSelectionGuardElements = {},\r
+ // All guard elements which can have a direction applied on them.\r
+ allGuardElements = {};\r
CKEDITOR.tools.extend( directSelectionGuardElements, guardElements, { tr:1, p:1, div:1, li:1 } );\r
+ CKEDITOR.tools.extend( allGuardElements, directSelectionGuardElements, { td:1 } );\r
\r
- function onSelectionChange( evt )\r
+ function onSelectionChange( e )\r
+ {\r
+ setToolbarStates( e );\r
+ handleMixedDirContent( e );\r
+ }\r
+\r
+ function setToolbarStates( evt )\r
{\r
var editor = evt.editor,\r
path = evt.data.path;\r
\r
useComputedState = useComputedState === undefined || useComputedState;\r
\r
- if ( useComputedState )\r
- {\r
- var selection = editor.getSelection(),\r
- ranges = selection.getRanges();\r
-\r
- selectedElement = ranges && ranges[ 0 ].getEnclosedNode();\r
-\r
- // If this is not our element of interest, apply to fully selected elements from guardElements.\r
- if ( !selectedElement || selectedElement\r
- && !( selectedElement.type == CKEDITOR.NODE_ELEMENT && selectedElement.getName() in directSelectionGuardElements )\r
- )\r
- selectedElement = getFullySelected( selection, guardElements );\r
- }\r
+ // We can use computedState provided by the browser or traverse parents manually.\r
+ if ( !useComputedState )\r
+ selectedElement = getElementForDirection( path.lastElement );\r
\r
selectedElement = selectedElement || path.block || path.blockLimit;\r
\r
\r
editor.getCommand( 'bidirtl' ).setState( selectionDir == 'rtl' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );\r
editor.getCommand( 'bidiltr' ).setState( selectionDir == 'ltr' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF );\r
+ }\r
\r
- var chromeRoot = editor.container.getChild( 1 );\r
+ function handleMixedDirContent( evt )\r
+ {\r
+ var editor = evt.editor,\r
+ chromeRoot = editor.container.getChild( 1 ),\r
+ directionNode = getElementForDirection( evt.data.path.lastElement );\r
\r
- if ( selectionDir != editor.lang.dir )\r
+ if ( directionNode && editor.lang.dir != directionNode.getComputedStyle( 'direction' ) )\r
chromeRoot.addClass( 'cke_mixed_dir_content' );\r
else\r
chromeRoot.removeClass( 'cke_mixed_dir_content' );\r
}\r
\r
- function switchDir( element, dir, editor )\r
+ /**\r
+ * Returns element with possibility of applying the direction.\r
+ * @param node\r
+ */\r
+ function getElementForDirection( node )\r
{\r
- var dirBefore = element.getComputedStyle( 'direction' ),\r
- currentDir = element.getStyle( 'direction' ) || element.getAttribute( 'dir' ) || '';\r
+ while ( node && !( node.getName() in allGuardElements || node.is( 'body' ) ) )\r
+ {\r
+ var parent = node.getParent();\r
+ if ( !parent )\r
+ break;\r
+\r
+ node = parent;\r
+ }\r
\r
+ return node;\r
+ }\r
+\r
+ function switchDir( element, dir, editor, database )\r
+ {\r
+ // Mark this element as processed by switchDir.\r
+ CKEDITOR.dom.element.setMarker( database, element, 'bidi_processed', 1 );\r
+\r
+ // Check whether one of the ancestors has already been styled.\r
+ var parent = element;\r
+ while ( ( parent = parent.getParent() ) && !parent.is( 'body' ) )\r
+ {\r
+ if ( parent.getCustomData( 'bidi_processed' ) )\r
+ {\r
+ // Ancestor style must dominate.\r
+ element.removeStyle( 'direction' );\r
+ element.removeAttribute( 'dir' );\r
+ return null;\r
+ }\r
+ }\r
+\r
+ var useComputedState = ( 'useComputedState' in editor.config ) ? editor.config.useComputedState : 1;\r
+\r
+ var elementDir = useComputedState ? element.getComputedStyle( 'direction' )\r
+ : element.getStyle( 'direction' ) || element.hasAttribute( 'dir' );\r
+\r
+ // Stop if direction is same as present.\r
+ if ( elementDir == dir )\r
+ return null;\r
+\r
+ // Reuse computedState if we already have it.\r
+ var dirBefore = useComputedState ? elementDir : element.getComputedStyle( 'direction' );\r
+\r
+ // Clear direction on this element.\r
element.removeStyle( 'direction' );\r
\r
- if ( currentDir.toLowerCase() == dir )\r
+ // Do the second check when computed state is ON, to check\r
+ // if we need to apply explicit direction on this element.\r
+ if ( useComputedState )\r
+ {\r
element.removeAttribute( 'dir' );\r
+ if ( dir != element.getComputedStyle( 'direction' ) )\r
+ element.setAttribute( 'dir', dir );\r
+ }\r
else\r
+ // Set new direction for this element.\r
element.setAttribute( 'dir', dir );\r
\r
// If the element direction changed, we need to switch the margins of\r
// the element and all its children, so it will get really reflected\r
// like a mirror. (#5910)\r
- var dirAfter = element.getComputedStyle( 'direction' );\r
- if ( dirAfter != dirBefore )\r
- {\r
- var range = new CKEDITOR.dom.range( element.getDocument() );\r
- range.setStartBefore( element );\r
- range.setEndAfter( element );\r
+ if ( dir != dirBefore )\r
+ editor.fire( 'dirChanged', element );\r
\r
- var walker = new CKEDITOR.dom.walker( range );\r
+ editor.forceNextSelectionCheck();\r
\r
- var node;\r
- while ( ( node = walker.next() ) )\r
- {\r
- if ( node.type == CKEDITOR.NODE_ELEMENT )\r
- {\r
- // A child with dir defined is to be ignored.\r
- if ( !node.equals( element ) && node.hasAttribute( 'dir' ) )\r
- {\r
- range.setStartAfter( node );\r
- walker = new CKEDITOR.dom.walker( range );\r
- continue;\r
- }\r
+ return null;\r
+ }\r
\r
- // Switch the margins.\r
- var marginLeft = node.getStyle( 'margin-right' ),\r
- marginRight = node.getStyle( 'margin-left' );\r
+ function getFullySelected( range, elements )\r
+ {\r
+ var ancestor = range.getCommonAncestor( false, true );\r
\r
- marginLeft ? node.setStyle( 'margin-left', marginLeft ) : node.removeStyle( 'margin-left' );\r
- marginRight ? node.setStyle( 'margin-right', marginRight ) : node.removeStyle( 'margin-right' );\r
- }\r
- }\r
- }\r
+ range.enlarge( CKEDITOR.ENLARGE_BLOCK_CONTENTS );\r
\r
- editor.forceNextSelectionCheck();\r
- }\r
+ if ( range.checkBoundaryOfElement( ancestor, CKEDITOR.START )\r
+ && range.checkBoundaryOfElement( ancestor, CKEDITOR.END ) )\r
+ {\r
+ var parent;\r
+ while ( ancestor && ancestor.type == CKEDITOR.NODE_ELEMENT\r
+ && ( parent = ancestor.getParent() )\r
+ && parent.getChildCount() == 1\r
+ && ( !( ancestor.getName() in elements ) || ( parent.getName() in elements ) )\r
+ )\r
+ ancestor = parent;\r
\r
- function getFullySelected( selection, elements )\r
- {\r
- var selectedElement = selection.getCommonAncestor();\r
- while( selectedElement.type == CKEDITOR.NODE_ELEMENT\r
- && !( selectedElement.getName() in elements )\r
- && selectedElement.getParent().getChildCount() == 1\r
- )\r
- selectedElement = selectedElement.getParent();\r
-\r
- return selectedElement.type == CKEDITOR.NODE_ELEMENT\r
- && ( selectedElement.getName() in elements )\r
- && selectedElement;\r
+ return ancestor.type == CKEDITOR.NODE_ELEMENT\r
+ && ( ancestor.getName() in elements )\r
+ && ancestor;\r
+ }\r
}\r
\r
function bidiCommand( dir )\r
\r
if ( ranges && ranges.length )\r
{\r
- // Apply do directly selected elements from guardElements.\r
- var selectedElement = ranges[ 0 ].getEnclosedNode();\r
+ var database = {};\r
\r
- // If this is not our element of interest, apply to fully selected elements from guardElements.\r
- if ( !selectedElement || selectedElement\r
- && !( selectedElement.type == CKEDITOR.NODE_ELEMENT && selectedElement.getName() in directSelectionGuardElements )\r
- )\r
- selectedElement = getFullySelected( selection, guardElements );\r
+ // Creates bookmarks for selection, as we may split some blocks.\r
+ var bookmarks = selection.createBookmarks();\r
\r
- if ( selectedElement )\r
- {\r
- if ( !selectedElement.isReadOnly() )\r
- switchDir( selectedElement, dir, editor );\r
- }\r
- else\r
+ var rangeIterator = ranges.createIterator(),\r
+ range,\r
+ i = 0;\r
+\r
+ while ( ( range = rangeIterator.getNextRange( 1 ) ) )\r
{\r
- // Creates bookmarks for selection, as we may split some blocks.\r
- var bookmarks = selection.createBookmarks();\r
+ // Apply do directly selected elements from guardElements.\r
+ var selectedElement = range.getEnclosedNode();\r
+\r
+ // If this is not our element of interest, apply to fully selected elements from guardElements.\r
+ if ( !selectedElement || selectedElement\r
+ && !( selectedElement.type == CKEDITOR.NODE_ELEMENT && selectedElement.getName() in directSelectionGuardElements )\r
+ )\r
+ selectedElement = getFullySelected( range, guardElements );\r
+\r
+ if ( selectedElement && !selectedElement.isReadOnly() )\r
+ switchDir( selectedElement, dir, editor, database );\r
\r
var iterator,\r
block;\r
\r
- for ( var i = ranges.length - 1 ; i >= 0 ; i-- )\r
+ // Walker searching for guardElements.\r
+ var walker = new CKEDITOR.dom.walker( range );\r
+\r
+ var start = bookmarks[ i ].startNode,\r
+ end = bookmarks[ i++ ].endNode;\r
+\r
+ walker.evaluator = function( node )\r
{\r
- // Array of elements processed as guardElements.\r
- var processedElements = [];\r
- // Walker searching for guardElements.\r
- var walker = new CKEDITOR.dom.walker( ranges[ i ] );\r
- walker.evaluator = function( node ){\r
- return node.type == CKEDITOR.NODE_ELEMENT\r
+ return !! ( node.type == CKEDITOR.NODE_ELEMENT\r
&& node.getName() in guardElements\r
&& !( node.getName() == ( enterMode == CKEDITOR.ENTER_P ) ? 'p' : 'div'\r
&& node.getParent().type == CKEDITOR.NODE_ELEMENT\r
- && node.getParent().getName() == 'blockquote'\r
- );\r
- };\r
-\r
- while ( ( block = walker.next() ) )\r
- {\r
- switchDir( block, dir, editor );\r
- processedElements.push( block );\r
- }\r
-\r
- iterator = ranges[ i ].createIterator();\r
- iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;\r
-\r
- while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )\r
- {\r
- if ( block.isReadOnly() )\r
- continue;\r
-\r
- var _break = 0;\r
-\r
- // Check if block have been already processed by the walker above.\r
- for ( var ii = 0; ii < processedElements.length; ii++ )\r
- {\r
- var parent = block.getParent();\r
-\r
- while( parent && parent.getName() != 'body' )\r
- {\r
- if ( ( parent.$.isSameNode && parent.$.isSameNode( processedElements[ ii ].$ ) )\r
- || parent.$ == processedElements[ ii ].$ )\r
- {\r
- _break = 1;\r
- break;\r
- }\r
- parent = parent.getParent();\r
- }\r
-\r
- if ( _break )\r
- break;\r
- }\r
-\r
- if ( !_break )\r
- {\r
- switchDir( block, dir, editor );\r
- }\r
- }\r
- }\r
-\r
- editor.forceNextSelectionCheck();\r
- // Restore selection position.\r
- selection.selectBookmarks( bookmarks );\r
+ && node.getParent().getName() == 'blockquote' )\r
+ // Element must be fully included in the range as well. (#6485).\r
+ && node.getPosition( start ) & CKEDITOR.POSITION_FOLLOWING\r
+ && ( ( node.getPosition( end ) & CKEDITOR.POSITION_PRECEDING + CKEDITOR.POSITION_CONTAINS ) == CKEDITOR.POSITION_PRECEDING ) );\r
+ };\r
+\r
+ while ( ( block = walker.next() ) )\r
+ switchDir( block, dir, editor, database );\r
+\r
+ iterator = range.createIterator();\r
+ iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;\r
+\r
+ while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )\r
+ !block.isReadOnly() && switchDir( block, dir, editor, database );\r
}\r
\r
+ CKEDITOR.dom.element.clearAllMarkers( database );\r
+\r
+ editor.forceNextSelectionCheck();\r
+ // Restore selection position.\r
+ selection.selectBookmarks( bookmarks );\r
+\r
editor.focus();\r
}\r
};\r
Got questions, comments, patches, etc.? Contact Jason Woofenden