Ticket #6909: 6909_2.patch

_source/plugins/menu/plugin.js

@@ -411 +411 @@
                         var hasSubMenu = this.getItems;
 
                         output.push(
-                                '<span class="cke_menuitem">' +
+                                '<span class="cke_menuitem' + ( this.icon && this.icon.indexOf( '.png' ) == -1 ? ' cke_noroomfix' : '' ) + '">' +
                                 '<a id="', id, '"' +
                                         ' class="', classes, '" href="javascript:void(\'', ( this.label || '' ).replace( "'", '' ), '\')"' +
                                         ' title="', this.label, '"' +

_source/plugins/button/plugin.js

@@ -181 +181 @@
                         classes += ' ' + this.className;
 
                 output.push(
-                        '<span class="cke_button">',
+                        '<span class="cke_button' + ( this.icon && this.icon.indexOf( '.png' ) == -1 ? ' cke_noroomfix' : '' ) + '">',
                         '<a id="', id, '"' +
                                 ' class="', classes, '"',
                                 env.gecko && env.version >= 10900 && !env.hc  ? '' : '" href="javascript:void(\''+ ( this.title || '' ).replace( "'", '' )+ '\')"',

_source/skins/kama/toolbar.css

@@ -197 +197 @@
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
 }
 .cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,
-.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *
+.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *,
+.cke_skin_kama .cke_browser_ie .cke_button.cke_noroomfix a.cke_disabled *
 {
         filter: alpha(opacity=30);
 }
@@ -270 +271 @@
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
 .cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,
-.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon
+.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,
+.cke_skin_kama .cke_browser_ie .cke_button.cke_noroomfix .cke_icon,
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button.cke_noroomfix .cke_icon
 {
         filter: ;
 }

_source/skins/kama/menu.css

@@ -58 +58 @@
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_icon
+.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_icon,
+.cke_browser_ie .cke_skin_kama .cke_menuitem.cke_noroomfix .cke_icon
 {
         filter: ;
 }
@@ -78 +79 @@
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon
+.cke_browser_ie6 .cke_skin_kama .cke_menuitem .cke_disabled .cke_icon,
+.cke_browser_ie .cke_skin_kama .cke_menuitem.cke_noroomfix .cke_disabled .cke_icon
 {
         filter: ;
 }

_source/skins/v2/toolbar.css

@@ -256 +256 @@
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
 }
 .cke_skin_v2 .cke_browser_ie6 .cke_button a.cke_disabled *,
-.cke_skin_v2 .cke_browser_ie6 a:hover.cke_button .cke_disabled *
+.cke_skin_v2 .cke_browser_ie6 a:hover.cke_button .cke_disabled *,
+.cke_skin_v2 .cke_browser_ie .cke_button.cke_noroomfix a.cke_disabled *
 {
         filter: alpha(opacity=30);
 }
@@ -312 +313 @@
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
 .cke_skin_v2 .cke_browser_ie6 .cke_button .cke_icon,
-.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon
+.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,
+.cke_skin_v2 .cke_browser_ie .cke_button.cke_noroomfix .cke_icon,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button.cke_noroomfix .cke_icon
 {
         filter: ;
 }

_source/skins/office2003/toolbar.css

@@ -286 +286 @@
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
 }
 .cke_skin_office2003 .cke_browser_ie6 .cke_button a.cke_disabled *,
-.cke_skin_office2003 .cke_browser_ie6 a:hover.cke_button .cke_disabled *
+.cke_skin_office2003 .cke_browser_ie6 a:hover.cke_button .cke_disabled *,
+.cke_skin_office2003 .cke_browser_ie .cke_button.cke_noroomfix a.cke_disabled *
 {
         filter: alpha(opacity=30);
 }
@@ -339 +340 @@
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
 .cke_skin_office2003 .cke_browser_ie6 .cke_button .cke_icon,
-.cke_skin_office2003 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon
+.cke_skin_office2003 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,
+.cke_skin_office2003 .cke_browser_ie .cke_button.cke_noroomfix .cke_icon,
+.cke_skin_office2003 .cke_browser_ie .cke_rtl .cke_button.cke_noroomfix .cke_icon
 {
         filter: ;
 }

_source/skins/office2003/menu.css

@@ -58 +58 @@
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_browser_ie6 .cke_skin_office2003 .cke_menuitem .cke_icon
+.cke_browser_ie6 .cke_skin_office2003 .cke_menuitem .cke_icon,
+.cke_browser_ie .cke_skin_office2003 .cke_menuitem.cke_noroomfix .cke_icon
 {
         filter: ;
 }
@@ -78 +79 @@
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_browser_ie6 .cke_skin_office2003 .cke_menuitem .cke_disabled .cke_icon
+.cke_browser_ie6 .cke_skin_office2003 .cke_menuitem .cke_disabled .cke_icon,
+.cke_browser_ie .cke_skin_office2003 .cke_menuitem.cke_noroomfix .cke_disabled .cke_icon
 {
         filter: ;
 }

_source/skins/v2/menu.css

@@ -57 +57 @@
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_icon
+.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_icon,
+.cke_browser_ie .cke_skin_v2 .cke_menuitem.cke_noroomfix .cke_icon
 {
         filter: ;
 }
@@ -78 +79 @@
 {
         filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
 }
-.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon
+.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon,
+.cke_browser_ie .cke_skin_v2 .cke_menuitem.cke_noroomfix .cke_disabled .cke_icon
 {
         filter: ;
 }