Ticket #7430: 7430_2.patch

_source/plugins/image/plugin.js

@@ -59 +59 @@
                                         return { image : CKEDITOR.TRISTATE_OFF };
                                 });
                 }
+
+                editor.on( 'align', function( ev )
+                        {
+                                var sel = ev.data.selection,
+                                        value = ev.data.value;
+
+                                if ( sel.getType() == CKEDITOR.SELECTION_ELEMENT ) 
+                                { 
+                                        var element = sel.getSelectedElement(),
+                                                align = getImageAlignment( element );
+
+                                        if ( align !== false )
+                                        {
+                                                if ( align == value )
+                                                        element.removeStyle( 'float' );
+                                                else
+                                                        element.setStyle( 'float', value );
+
+                                                ev.cancel();
+                                        }
+                                }
+                        });
+
+                editor.on( 'getAlignState', function( ev )
+                        {
+                                var element = ev.data.path.lastElement,
+                                        value = ev.data.value,
+                                        align = getImageAlignment( element );
+
+                                if ( align !== false )
+                                {
+                                        ev.data.state =
+                                                ( align == value ) ? CKEDITOR.TRISTATE_ON :
+                                                ( value == 'right' || value == 'left' ) ? CKEDITOR.TRISTATE_OFF :
+                                                CKEDITOR.TRISTATE_DISABLED;
+                                }
+                        });
+
+                function getImageAlignment( element )
+                {
+                        var align = false;
+
+                        if ( element.is( 'img' ) && !element.data( 'cke-real-element-type' ) )
+                        {
+                                align = element.getStyle( 'float' );
+                                if ( align == 'inherit' || align == 'none' )
+                                        align = 0;
+
+                                if ( !align )
+                                        align = element.getAttribute( 'align' );
+                        }
+
+                        return align;
+                }
         }
 } );
 

_source/plugins/justify/plugin.js

@@ -11 +11 @@
 {
         function getState( editor, path )
         {
-                var firstBlock = path.block || path.blockLimit;
+                var firstBlock = path.block || path.blockLimit,
+                        value = this.value,
+                        data = { value : value, path : path, state : -1 };
 
+                editor.fire( 'getAlignState', data );
+
+                if ( data.state != -1 )
+                        return data.state;
+
                 if ( !firstBlock || firstBlock.getName() == 'body' )
                         return CKEDITOR.TRISTATE_OFF;
 
-                return ( getAlignment( firstBlock, editor.config.useComputedState ) == this.value ) ?
+                return ( getAlignment( firstBlock, editor.config.useComputedState ) == value ) ?
                         CKEDITOR.TRISTATE_ON :
                         CKEDITOR.TRISTATE_OFF;
         }
@@ -147 +154 @@
                         if ( !selection )
                                 return;
 
+                        if ( editor.fire( 'align', { value : this.value, selection : selection } ) === true )
+                                return;
+
                         var bookmarks = selection.createBookmarks(),
                                 ranges = selection.getRanges( true );