Ticket #9381: 9381.patch

_source/plugins/image/dialogs/image.js

@@ -846 +846 @@
                                                                                                                                 element.setStyle( 'border-style', 'solid' );
                                                                                                                         }
                                                                                                                         else if ( !value && this.isChanged() )
-                                                                                                                        {
-                                                                                                                                element.removeStyle( 'border-width' );
-                                                                                                                                element.removeStyle( 'border-style' );
-                                                                                                                                element.removeStyle( 'border-color' );
-                                                                                                                        }
+                                                                                                                                element.removeStyle( 'border' );
 
                                                                                                                         if ( !internalCommit && type == IMAGE )
                                                                                                                                 element.removeAttribute( 'border' );

_source/core/dom/element.js

@@ -105 +105 @@
         }
 };
 
+( function()
+{
+
 CKEDITOR.tools.extend( CKEDITOR.dom.element.prototype,
         /** @lends CKEDITOR.dom.element.prototype */
         {
@@ -1189 +1192 @@
                 {
                         // Removes the specified property from the current style object.
                         var $ = this.$.style;
+
+                        // "removeProperty" need to be specific on the following styles.
+                        if ( !$.removeProperty && ( name == 'border' || name == 'margin' || name == 'padding' ) )
+                        {
+                                var names = specificRules( name );
+                                for ( var i = 0 ; i < names.length ; i++ ) {
+                                        this.removeStyle( names[ i ] );
+                                }
+                                return;
+                        }
+
                         $.removeProperty ? $.removeProperty( name ) : $.removeAttribute( CKEDITOR.tools.cssStyleToDomStyle( name ) );
 
                         if ( !this.$.style.cssText )
@@ -1755 +1769 @@
                 }
         });
 
-( function()
-{
         var sides = {
                 width : [ "border-left-width", "border-right-width","padding-left", "padding-right" ],
                 height : [ "border-top-width", "border-bottom-width", "padding-top",  "padding-bottom" ]
         };
+
+        // Generate list of specific style rules, applicable to margin/padding/border.
+        function specificRules( style ) {
+                var sides = [ 'top', 'left', 'right', 'bottom' ], components;
+
+                switch ( style ) {
+                        case 'border' :
+                                components = [ 'color', 'style', 'width' ];
+                }
+
+                var styles = [];
+                for ( var i = 0 ; i < sides.length ; i++ ) {
+
+                        if ( components )
+                        {
+                                for ( var j = 0 ; j < components.length ; j++) {
+                                        styles.push( [ style, sides[ i ], components[j] ].join( '-' ) );
+                                }
+                        }
+                        else
+                                styles.push( [ style, sides[ i ] ].join( '-' ) );
+                }
+
+                return styles;
+        }
 
         function marginAndPaddingSize( type )
         {