Ticket #4789: 4789.patch

_source/plugins/image/dialogs/image.js

@@ -806 +806 @@
                                                                                                                 if ( type == IMAGE || type == PREVIEW )
                                                                                                                 {
                                                                                                                         if ( value )
-                                                                                                                                element.setStyle( 'border', CKEDITOR.tools.cssLength( value ) + ' solid' );
+                                                                                                                        {
+                                                                                                                                element.setStyle( 'border-width', CKEDITOR.tools.cssLength( value ) );
+                                                                                                                                element.setStyle( 'border-style', 'solid' );
+                                                                                                                        }
                                                                                                                         else if ( !value && this.isChanged() )
                                                                                                                         {
-                                                                                                                                if( CKEDITOR.env.ie )
-                                                                                                                                {
-                                                                                                                                        element.removeStyle( 'border-width' );
-                                                                                                                                        element.removeStyle( 'border-style' );
-                                                                                                                                        element.removeStyle( 'border-color' );
-                                                                                                                                }
-                                                                                                                                else
-                                                                                                                                        element.removeStyle( 'border' );
-                                                                                                                        }
+                                                                                                                                element.removeStyle( 'border-width' );
+                                                                                                                                element.removeStyle( 'border-style' );
+                                                                                                                                element.removeStyle( 'border-color' );
+                                                                                                                        }
 
                                                                                                                         if( !internalCommit && type == IMAGE )
                                                                                                                                 element.removeAttribute( 'border' );
@@ -825 +823 @@
                                                                                                                 else if ( type == CLEANUP )
                                                                                                                 {
                                                                                                                         element.removeAttribute( 'border' );
-                                                                                                                        element.removeStyle( 'border' );
+                                                                                                                        element.removeStyle( 'border-width' );
+                                                                                                                        element.removeStyle( 'border-style' );
+                                                                                                                        element.removeStyle( 'border-color' );
                                                                                                                 }
                                                                                                         }
                                                                                                 },