Changeset 958

Timestamp:

10/03/07 11:31:57 (6 years ago)

Author:

martinkou

Message:

Fixed #1308 : Text alignment button states should tie to the visual alignment directly instead of being tied to the immediate block's style attributes.

File:

• FCKeditor/trunk/editor/_source/commandclasses/fckjustifycommands.js (modified) (1 diff)

FCKeditor/trunk/editor/_source/commandclasses/fckjustifycommands.js

@@ -164 +164 @@
                 if ( !cssClassRegex )
                 {
-                        // Definitions in the "style" override the "align" attribute, so it
-                        // gets precedence.
-                        var currentAlign = firstBlock.style.textAlign || firstBlock.align ;
-
+                        var currentAlign ;
+                        if ( FCKBrowserInfo.IsIE )
+                                currentAlign = firstBlock.currentStyle.textAlign ;
+                        else
+                                currentAlign = FCK.EditorWindow.getComputedStyle( firstBlock, '' ).getPropertyValue( 'text-align' );
+                        currentAlign = currentAlign.replace( /(-moz-|-webkit-|start|auto)/i, '' );
                         if ( ( !currentAlign && this.IsDefaultAlign ) || currentAlign == this.AlignValue )
                                 return FCK_TRISTATE_ON ;
+                        return FCK_TRISTATE_OFF ;
                 }
                 else