Ticket #3231: 3231.patch

_source/plugins/selection/plugin.js

@@ -21 +21 @@
                                 return;
 
                         var firstElement = sel.getStartElement();
-                        var currentPath = new CKEDITOR.dom.elementPath( firstElement );
+                        var currentPath = new CKEDITOR.dom.elementPath( firstElement ),
+                                rootPath = new CKEDITOR.dom.elementPath( 
+                                        sel.getRanges()[0].getCommonAncestor( true ) );
 
                         if ( !currentPath.compare( this._.selectionPreviousPath ) )
                         {
@@ -26 +28 @@
                         if ( !currentPath.compare( this._.selectionPreviousPath ) )
                         {
                                 this._.selectionPreviousPath = currentPath;
-                                this.fire( 'selectionChange', { selection : sel, path : currentPath, element : firstElement } );
+                                this.fire( 'selectionChange', 
+                                        { selection : sel, path : currentPath, rootPath: rootPath, element : firstElement } );
                         }
                 }
                 catch (e)
@@ -31 +34 @@
                 }
                 catch (e)
                 {}
-        };
+        }
 
         var checkSelectionChangeTimer,
                 checkSelectionChangeTimeoutPending;

_source/plugins/styles/plugin.js

@@ -49 +49 @@
 
                                         // Check the current state for the style defined for that
                                         // callback.
-                                        var currentState = callback.style.checkActive( ev.data.path ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
+                                        var currentState = callback.style.checkActive( ev.data.rootPath ) ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF;
 
                                         // If the state changed since the last check.
                                         if ( callback.state !== currentState )