Changeset 2105 for FCKeditor/branches

Timestamp:

2008-06-23 11:16:35 (5 months ago)

Author:

martinkou

Message:

Improved the logic for retrieving and setting text direction in the div dialog so that it will work correctly in RTL documents.

Files:

• FCKeditor/branches/features/div_container/editor/dialog/fck_div.html (modified) (5 diffs)

FCKeditor/branches/features/div_container/editor/dialog/fck_div.html

@@ -69 +69 @@
 }
 
+function GetNearestAncestorDirection( node )
+{
+        var dir = 'ltr' ;       // HTML default.
+        while ( ( node = node.parentNode ) )
+        {
+                if ( node.dir )
+                        dir = node.dir ;
+        }
+        return dir ;
+}
+
 window.onload = function()
 {
@@ -97 +108 @@
                 GetE( 'selStyle' ).value = i ;
 
+        // Set the value for other inputs
         if ( ActiveEl )
         {
@@ -104 +116 @@
                 GetE( 'txtInlineStyle').value = ActiveEl.getAttribute( 'style' ) ;
                 GetE( 'txtTitle' ).value = ActiveEl.title ;
-                GetE( 'selLangDir').value = ActiveEl.dir ;
+                GetE( 'selLangDir').value = ActiveEl.dir || GetNearestAncestorDirection( ActiveEl ) ;
         }
 }
@@ -128 +140 @@
         }
 
+        // Apply modifications to the DIV container according to dialog inputs.
         setValue( 'class', 'txtClass' ) ;
         setValue( 'id', 'txtId' ) ;
@@ -136 +149 @@
                 setValue( 'style', 'txtInlineStyle' ) ;
         setValue( 'title', 'txtTitle' ) ;
-        setValue( 'dir', 'selLangDir' ) ;
+        var dir = GetE( 'selLangDir' ).value ;
+        if ( GetNearestAncestorDirection( ActiveEl ) != dir )
+                ActiveEl.dir = dir ;
+        else
+                ActiveEl.removeAttribute( 'dir' ) ;
 
         var styleName = GetE( 'selStyle' ).value ;