Changeset 5871

Timestamp:

09/12/10 20:31:07 (3 years ago)

Author:

Saare

Message:

#6129: BIDI: Show Blocks should show the HTML Tags on the Right for RTL Languages.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/showblocks/images/block_address.png (modified) (previous)
• _source/plugins/showblocks/images/block_blockquote.png (modified) (previous)
• _source/plugins/showblocks/images/block_div.png (modified) (previous)
• _source/plugins/showblocks/images/block_h1.png (modified) (previous)
• _source/plugins/showblocks/images/block_h2.png (modified) (previous)
• _source/plugins/showblocks/images/block_h3.png (modified) (previous)
• _source/plugins/showblocks/images/block_h4.png (modified) (previous)
• _source/plugins/showblocks/images/block_h5.png (modified) (previous)
• _source/plugins/showblocks/images/block_h6.png (modified) (previous)
• _source/plugins/showblocks/images/block_p.png (modified) (previous)
• _source/plugins/showblocks/images/block_pre.png (modified) (previous)
• _source/plugins/showblocks/plugin.js (modified) (3 diffs)

CKEditor/trunk/CHANGES.html

@@ -72 +72 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6255">#6255</a> : Inserting a page break as the first node triggered an error.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6188">#6188</a> : [IE7] Automatic color button had the wrong cursor.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6129">#6129</a> : The show blocks' labels are now shown in the right for RTL languages.</li>
                 <li>Updated the following language files:<ul>
                         <li><a href="http://dev.ckeditor.com/ticket/6246">#6246</a> : Chinese Simplified;</li>

CKEditor/trunk/_source/plugins/showblocks/plugin.js

@@ -25 +25 @@
                 '{'+
                         'background-repeat: no-repeat;'+
+                        'background-position: top %3;'+
                         'border: 1px dotted gray;'+
                         'padding-top: 8px;'+
-                        'padding-left: 8px;'+
+                        'padding-%3: 8px;'+
                 '}'+
 
@@ -85 +86 @@
                 '}';
 
-        var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g;
+        var cssTemplateRegex = /%1/g, cssClassRegex = /%2/g, backgroundPositionRegex = /%3/g;
 
         var commandDefinition =
@@ -119 +120 @@
                         editor.addCss( cssTemplate
                                 .replace( cssTemplateRegex, 'background-image: url(' + CKEDITOR.getUrl( this.path ) + 'images/block_' )
-                                .replace( cssClassRegex, 'cke_show_blocks ' ) );
+                                .replace( cssClassRegex, 'cke_show_blocks ' )
+                                .replace( backgroundPositionRegex, editor.lang.dir == 'rtl' ? 'right' : 'left' ) );
 
                         editor.ui.addButton( 'ShowBlocks',