Changeset 2104 for FCKeditor/branches

Timestamp:

2008-06-23 10:59:19 (5 months ago)

Author:

martinkou

Message:

Fixed the div container dialog's style menu to only display styles for DIV elements.

Files:

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

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

@@ -79 +79 @@
         // Popuplate the style menu
         var styles = FCKStyles.GetStyles() ;
+        var match = null ;
+        var selectableStyles = {} ;
         for ( var i in styles )
         {
-                if ( ! /^_FCK_/.test( i ) )
+                if ( ! /^_FCK_/.test( i ) && styles[i].Element == 'div' )
                 {
-                        AddStyleOption( i ) ;
                         if ( ActiveEl && styles[i].CheckElementRemovable( ActiveEl, true ) )
-                                GetE( 'selStyle' ).value = i ;
+                                match = i ;
+                        selectableStyles[i] = styles[i] ;
                 }
         }
+        if ( !match )
+                AddStyleOption( "" ) ;
+        for ( var i in selectableStyles )
+                AddStyleOption( i ) ;
+        if ( match )
+                GetE( 'selStyle' ).value = i ;
 
         if ( ActiveEl )
@@ -131 +139 @@
 
         var styleName = GetE( 'selStyle' ).value ;
-        var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
-        range.SetStart( ActiveEl, 3 ) ;
-        range.SetEnd( ActiveEl, 4 ) ;
         if ( styleName )
-                FCKStyles.GetStyle( styleName ).ApplyToRange( range, false, true ) ;
+                FCKStyles.GetStyle( styleName ).ApplyToObject( ActiveEl ) ;
 
         return true ;
@@ -154 +159 @@
                                         <span fcklang="DlgDivStyle">Style</span><br />
                                         <select id="selStyle" style="width: 100%;">
-                                                <option value="">&nbsp;
                                         </select>
                                 </td>