Changeset 1031

Timestamp:

2007-10-16 14:10:28 (2 years ago)

Author:

fredck

Message:

Fixed #1400 : Fixed the loading of FCKConfig.CustomStyles to properly initialize the style names.

Files:

• FCKeditor/trunk/editor/_source/internals/fckstyles.js (modified) (9 diffs)

FCKeditor/trunk/editor/_source/internals/fckstyles.js

@@ -38 +38 @@
                         else
                                 style.ApplyToSelection( FCK.EditorWindow ) ;
-        
+
                         FCK.Events.FireEvent( 'OnSelectionChange' ) ;
                 }
@@ -219 +219 @@
                 FCK.Events.FireEvent( 'OnSelectionChange' ) ;
         },
-        
+
         GetStyle : function( styleName )
         {
@@ -230 +230 @@
                 if ( !styles )
                 {
-                        styles = this._GetStyles = FCKTools.Merge( 
+                        styles = this._GetStyles = FCKTools.Merge(
                                 this._LoadStylesCore(),
                                 this._LoadStylesCustom(),
@@ -237 +237 @@
                 return styles ;
         },
-        
+
         CheckHasObjectStyle : function( elementName )
         {
@@ -265 +265 @@
                 {
                         for ( var styleName in styleDefs )
-                                styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ;
+                        {
+                                var style = styles[ styleName ] = new FCKStyle( styleDefs[ styleName ] ) ;
+                                style.Name = styleName ;
+                        }
                 }
 
@@ -283 +286 @@
                 var xml = new FCKXml() ;
                 xml.LoadUrl( stylesXmlPath ) ;
-                
+
                 var stylesXmlObj = FCKXml.TransformToObject( xml.SelectSingleNode( 'Styles' ) ) ;
 
@@ -326 +329 @@
                         // Load override definitions.
                         var cssStyleOverrideNodes = styleNode.$Override ;
-                        if ( cssStyleOverrideNodes ) 
+                        if ( cssStyleOverrideNodes )
                         {
                                 for ( j = 0 ; j < cssStyleOverrideNodes.length ; j++ )
                                 {
                                         var overrideNode = cssStyleOverrideNodes[j] ;
-                                        var overrideDef = 
+                                        var overrideDef =
                                         {
                                                 Element : overrideNode.element
                                         } ;
-                                        
+
                                         var overrideAttNode = overrideNode.$Attribute ;
                                         if ( overrideAttNode )
@@ -353 +356 @@
                                                 }
                                         }
-                                        
+
                                         styleDef.Overrides.push( overrideDef ) ;
                                 }
@@ -360 +363 @@
                         var style = new FCKStyle( styleDef ) ;
                         style.Name = styleNode.name || element ;
-                        
+
                         if ( style.GetType() == FCK_STYLE_OBJECT )
                                 this._ObjectStyles[ element ] = true ;