Ticket #7351: 7351_2.patch

_source/plugins/image/dialogs/image.js

@@ -638 +638 @@
                                                                                                                         validate : function()
                                                                                                                         {
                                                                                                                                 var aMatch  =  this.getValue().match( regexGetSizeOrEmpty ),
-                                                                                                                                        isValid = !!( aMatch && aMatch[ 1 ] != 0 );
+                                                                                                                                        isValid = !!( aMatch && parseInt( aMatch[1], 10 ) != 0 );
                                                                                                                                 if ( !isValid )
                                                                                                                                         alert( editor.lang.common.invalidWidth );
                                                                                                                                 return isValid;
@@ -651 +651 @@
                                                                                                                                 {
                                                                                                                                         if ( value )
                                                                                                                                                 element.setStyle( 'width', CKEDITOR.tools.cssLength( value ) );
-                                                                                                                                        else if ( !value && this.isChanged( ) )
+                                                                                                                                        else if ( !value && this.isChanged() )
                                                                                                                                                 element.removeStyle( 'width' );
 
                                                                                                                                         !internalCommit && element.removeAttribute( 'width' );
@@ -687 +687 @@
                                                                                                                         },
                                                                                                                         validate : function()
                                                                                                                         {
-                                                                                                                                var aMatch = this.getValue().match( regexGetSizeOrEmpty );
-                                                                                                                                if ( !aMatch || aMatch[1] == 0 )
+                                                                                                                                var aMatch = this.getValue().match( regexGetSizeOrEmpty ),
+                                                                                                                                        isValid = !!( aMatch && parseInt( aMatch[1], 10 ) != 0 );
+                                                                                                                                if ( !isValid )
                                                                                                                                         alert( editor.lang.common.invalidHeight );
-                                                                                                                                return !!aMatch;
+                                                                                                                                return isValid;
                                                                                                                         },
                                                                                                                         setup : setupDimension,
                                                                                                                         commit : function( type, element, internalCommit )