Ticket #4980: 4980.patch

_source/plugins/dialogui/plugin.js

@@ -955 +955 @@
                                  */
                                 setValue : function( value )
                                 {
-                                        value = value || '';
+                                        value = ( value != null ) ? value : '';
                                         return CKEDITOR.ui.dialog.uiElement.prototype.setValue.call( this, value );
                                 },
 

_source/plugins/image/dialogs/image.js

@@ -800 +800 @@
                                                                                                                 {
                                                                                                                         var value,
                                                                                                                                 borderStyle = element.getStyle( 'border-width' );
-
                                                                                                                         borderStyle = borderStyle && borderStyle.match( /^(\d+px)(?: \1 \1 \1)?$/ );
                                                                                                                         value = borderStyle && parseInt( borderStyle[ 1 ], 10 );
-                                                                                                                        !value && ( value = element.getAttribute( 'border' ) );
-
+                                                                                                                        isNaN ( parseInt( value ) ) && ( value = element.getAttribute( 'border' ) );
                                                                                                                         this.setValue( value );
                                                                                                                 }
                                                                                                         },
@@ -813 +811 @@
                                                                                                                 var value = parseInt( this.getValue(), 10 );
                                                                                                                 if ( type == IMAGE || type == PREVIEW )
                                                                                                                 {
-                                                                                                                        if ( value )
+                                                                                                                        if ( !isNaN( value ) )
                                                                                                                         {
                                                                                                                                 element.setStyle( 'border-width', CKEDITOR.tools.cssLength( value ) );
                                                                                                                                 element.setStyle( 'border-style', 'solid' );
@@ -873 +871 @@
                                                                                                                         marginRightPx = parseInt( marginRightStyle, 10 );
 
                                                                                                                         value = ( marginLeftPx == marginRightPx ) && marginLeftPx;
-                                                                                                                        !value && ( value = element.getAttribute( 'hspace' ) );
+                                                                                                                        isNaN( parseInt( value ) ) && ( value = element.getAttribute( 'hspace' ) );
 
                                                                                                                         this.setValue( value );
                                                                                                                 }
@@ -883 +881 @@
                                                                                                                 var value = parseInt( this.getValue(), 10 );
                                                                                                                 if ( type == IMAGE || type == PREVIEW )
                                                                                                                 {
-                                                                                                                        if ( value )
+                                                                                                                        if ( !isNaN( value ) )
                                                                                                                         {
                                                                                                                                 element.setStyle( 'margin-left', CKEDITOR.tools.cssLength( value ) );
                                                                                                                                 element.setStyle( 'margin-right', CKEDITOR.tools.cssLength( value ) );
@@ -941 +939 @@
                                                                                                                         marginBottomPx = parseInt( marginBottomStyle, 10 );
 
                                                                                                                         value = ( marginTopPx == marginBottomPx ) && marginTopPx;
-                                                                                                                        !value && ( value = element.getAttribute( 'vspace' ) );
+                                                                                                                        isNaN ( parseInt( value ) ) && ( value = element.getAttribute( 'vspace' ) );
                                                                                                                         this.setValue( value );
                                                                                                                 }
                                                                                                         },
@@ -950 +948 @@
                                                                                                                 var value = parseInt( this.getValue(), 10 );
                                                                                                                 if ( type == IMAGE || type == PREVIEW )
                                                                                                                 {
-                                                                                                                        if ( value )
+                                                                                                                        if ( !isNaN( value ) )
                                                                                                                         {
                                                                                                                                 element.setStyle( 'margin-top', CKEDITOR.tools.cssLength( value ) );
                                                                                                                                 element.setStyle( 'margin-bottom', CKEDITOR.tools.cssLength( value ) );