Ticket #156: fck.style.combobox.patch

editor/_source/classes/fckstyledef_ie.js

@@ -31 +31 @@
         
         if ( oSelection.type == 'Text' )
         {
-                var oRange = oSelection.createRange() ;
-                
-                // Create the main element.
-                var e = document.createElement( this.Element ) ;
-                e.innerHTML = oRange.htmlText ;
-                
-                // Set the attributes.
-                this._AddAttributes( e ) ;
-                
-                // Remove the duplicated elements.
-                this._RemoveDuplicates( e ) ;
-                
-                // Replace the selection with the resulting HTML.
-                oRange.pasteHTML( e.outerHTML ) ;
+                var oControl = FCK.ToolbarSet.CurrentInstance.Selection.GetParentElement() ;
+                if ( oControl.tagName == this.Element )
+                        this._AddAttributes( oControl ) ;
         }
         else if ( oSelection.type == 'Control' )
         {
@@ -101 +90 @@
                                 if ( e.style.cssText.toLowerCase() != this.Attributes[a].toLowerCase() )
                                         return false ;
                                 break ;
+                        case 'src' :
+                                var src = e.getAttribute( '_fcksavedurl' ) ;
+                                if (src == null) src = e.getAttribute( a, 0 );
+                                if (src != this.Attributes[a])
+                                        return false;
+                                break;
                         case 'class' :
                                 if ( e.getAttribute( 'className', 0 ) != this.Attributes[a] )
                                         return false ;

editor/_source/classes/fcktoolbarstylecombo.js

@@ -101 +101 @@
 
 FCKToolbarStyleCombo.prototype.RefreshVisibleItems = function( targetSpecialCombo )
 {
+        var sTagName;
+
         if ( FCKSelection.GetType() == 'Control' )
-                var sTagName = FCKSelection.GetSelectedElement().tagName ;
+                sTagName = FCKSelection.GetSelectedElement().tagName ;
+        else
+                {
+                        if (FCKBrowserInfo.IsIE) 
+                                {
+                                        var e = FCKSelection.GetParentElement();
+                                        if (!e) return;
+                                        sTagName = e.tagName ;
+                                }
+                }
 
         for ( var i in targetSpecialCombo.Items )
         {