Changeset 1378

Timestamp:

2008-01-20 22:59:52 (6 months ago)

Author:

alfonsoml

Message:

Fix for #1503, improve the ability to work with Styles

Location:

FCKeditor/trunk

Files:

• editor/_source/classes/fckstyle.js (modified) (3 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor/trunk/editor/_source/classes/fckstyle.js

@@ -232 +232 @@
                                                 this._RemoveOverrides( pathElement, styleOverrides[ pathElementName ] ) ;
 
-                                                // Remove the element if no more attributes are available.
-                                                this._RemoveNoAttribElement( pathElement ) ;
+                                                // Remove the element if no more attributes are available and it's an inline style element
+                                                if ( this.GetType() == FCK_STYLE_INLINE)
+                                                        this._RemoveNoAttribElement( pathElement ) ;
                                         }
                                 }
@@ -487 +488 @@
                 {
                         case FCK_STYLE_BLOCK :
-                                return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit ) ;
+                                return this.CheckElementRemovable( elementPath.Block || elementPath.BlockLimit, true ) ;
 
                         case FCK_STYLE_INLINE :
@@ -689 +690 @@
                 }
 
-                return ( valueA == valueB )
+                // Return true if they match or if valueA is null and valueB is an empty string
+                return ( valueA == valueB || ( ( valueA === null || valueA === '' ) && ( valueB === null || valueB === '' ) ) )
         },
 

FCKeditor/trunk/_whatsnew.html

@@ -48 +48 @@
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1522">#1522</a>] The ENTER
                         key will now work properly in IE with the cursor at the start of a formatted block.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1503">#1503</a>] It's possible
+                        to define in the Styles that a Style (with an empty class) must be shown selected
+                        only when no class is present in the current element, and selecting that item will 
+                        clear the current class (it does apply to any attribute, not only classes).</li>
+
         </ul>
         <p>