Ticket #6670: 6670.patch

_source/plugins/bidi/plugin.js

@@ -48 +48 @@
         {
                 var editor = evt.editor,
                         chromeRoot = editor.container.getChild( 1 ),
-                        directionNode = getElementForDirection( evt.data.path.lastElement );
+                        directionNode = getElementForDirection( evt.data.path.lastElement, 1 );
 
                 if ( directionNode && editor.lang.dir != directionNode.getComputedStyle( 'direction' ) )
                         chromeRoot.addClass( 'cke_mixed_dir_content' );
@@ -58 +58 @@
 
         /**
          * Returns element with possibility of applying the direction.
-         * @param node
+         * @param {CKEDITOR.dom.node} node
+         * @param {boolean} includeNodesWithDirection If set to TRUE, includes nodes that already have direction,
+         *  although inline elements are skipped.
          */
-        function getElementForDirection( node )
+        function getElementForDirection( node, includeNodesWithDirection )
         {
-                while ( node && !( node.getName() in allGuardElements || node.is( 'body' ) ) )
+                while ( node && !( node.getName() in allGuardElements || node.is( 'body' ) )
+                        && !( includeNodesWithDirection && node.getDirection() && !CKEDITOR.dtd.$inline[ node.getName() ] ) )
                 {
                         var parent = node.getParent();
                         if ( !parent )