Ticket #7981: 7981_2.patch

_source/plugins/pastefromword/filter/default.js

@@ -261 +261 @@
                                                                         {
                                                                                 // Deal with component/short-hand form.
                                                                                 var values = margin.split( ' ' );
-                                                                                margin = plugin.utils.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );
-                                                                                margin = parseInt( margin, 10 );
+                                                                                margin = CKEDITOR.tools.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );
 
                                                                                 // Figure out the indent unit by checking the first time of incrementation.
                                                                                 if ( !listBaseIndent && previousListItemMargin !== null && margin > previousListItemMargin )
@@ -310 +309 @@
                                 return false;
                         },
 
-                        // Convert various length units to 'px' in ignorance of DPI.
-                        convertToPx : ( function ()
-                        {
-                                var calculator = CKEDITOR.dom.element.createFromHtml(
-                                                                '<div style="position:absolute;left:-9999px;' +
-                                                                'top:-9999px;margin:0px;padding:0px;border:0px;"' +
-                                                                '></div>', CKEDITOR.document );
-                                CKEDITOR.document.getBody().append( calculator );
-
-                                return function( cssLength )
-                                {
-                                        if ( cssLengthRelativeUnit.test( cssLength ) )
-                                        {
-                                                calculator.setStyle( 'width', cssLength );
-                                                return calculator.$.clientWidth + 'px';
-                                        }
-
-                                        return cssLength;
-                                };
-                        } )(),
-
                         // Providing a shorthand style then retrieve one or more style component values.
                         getStyleComponents : ( function()
                         {
@@ -423 +401 @@
                                                                                 [ 'tab-stops', null, function( val )
                                                                                 {
                                                                                         var margin = val.split( ' ' )[ 1 ].match( cssLengthRelativeUnit );
-                                                                                        margin && ( previousListItemMargin = parseInt( plugin.utils.convertToPx( margin[ 0 ] ), 10 ) );
+                                                                                        margin && ( previousListItemMargin = CKEDITOR.tools.convertToPx( margin[ 0 ] ) );
                                                                                 } ],
                                                                                 ( level == 1 ? [ 'mso-list', null, function( val )
                                                                                 {
@@ -779 +757 @@
                                 isListBulletIndicator = this.utils.isListBulletIndicator,
                                 containsNothingButSpaces = this.utils.isContainingOnlySpaces,
                                 resolveListItem = this.utils.resolveList,
-                                convertToPx = this.utils.convertToPx,
+                                convertToPx = function( value )
+                                        {
+                                                value = CKEDITOR.tools.convertToPx( value );
+                                                return isNaN( value ) ? value : value + 'px';
+                                        },
                                 getStyleComponents = this.utils.getStyleComponents,
                                 listDtdParents = this.utils.listDtdParents,
                                 removeFontStyles = config.pasteFromWordRemoveFontStyles !== false,

_source/plugins/iframe/dialogs/iframe.js

@@ -50 +50 @@
                         title : iframeLang.title,
                         minWidth : 350,
                         minHeight : 260,
-                        onLoad : function()
-                        {
-                                var dialog = this,
-                                        styles = dialog.getContentElement( 'advanced', 'advStyles' );
-
-                                styles && styles.on( 'change', function()
-                                        {
-                                                // Synchronize width value.
-                                                var width = this.getStyle( 'width', '' ),
-                                                        txtWidth = dialog.getContentElement( 'info', 'width' );
-
-                                                txtWidth && txtWidth.setValue( width, true );
-
-                                                // Synchronize height value.
-                                                var height = this.getStyle( 'height', '' ),
-                                                        txtHeight = dialog.getContentElement( 'info', 'height' );
-
-                                                txtHeight && txtHeight.setValue( height, true );
-                                        });
-                        },
                         onShow : function()
                         {
                                 // Clear previously saved elements.
@@ -83 +63 @@
                                         var iframeNode = editor.restoreRealElement( fakeImage );
                                         this.iframeNode = iframeNode;
 
-                                        this.setupContent( iframeNode, fakeImage );
+                                        this.setupContent( iframeNode );
                                 }
-
-                                // Call the onChange method for the widht and height fields so
-                                // they get reflected into the Advanced tab.
-                                var widthInput = this.getContentElement( 'info', 'width' ),
-                                        heightInput = this.getContentElement( 'info', 'height' );
-                                widthInput && widthInput.onChange();
-                                heightInput && heightInput.onChange();
                         },
                         onOk : function()
                         {
@@ -152 +125 @@
                                                                         style : 'width:100%',
                                                                         labelLayout : 'vertical',
                                                                         label : commonLang.width,
-                                                                        validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength ),
+                                                                        validate : CKEDITOR.dialog.validate.htmlLength( editor.lang.common.invalidHtmlLength ),
                                                                         getValue : defaultToPixel,
                                                                         setup : function( iframeNode, fakeImage )
                                                                         {
@@ -164 +137 @@
                                                                                 commitValue.apply( this, arguments );
                                                                                 var val = this.getValue();
                                                                                 val && ( extraStyles.width = val );
-                                                                        },
-                                                                        onChange : function()
-                                                                        {
-                                                                                var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' ),
-                                                                                        value = this.getValue();
-                                                                                styles && styles.updateStyle( 'width', value );
                                                                         }
                                                                 },
                                                                 {
@@ -178 +145 @@
                                                                         style : 'width:100%',
                                                                         labelLayout : 'vertical',
                                                                         label : commonLang.height,
-                                                                        validate : CKEDITOR.dialog.validate.cssLength( editor.lang.common.invalidCssLength ),
+                                                                        validate : CKEDITOR.dialog.validate.htmlLength( editor.lang.common.invalidHtmlLength ),
                                                                         getValue : defaultToPixel,
                                                                         setup : function( iframeNode, fakeImage )
                                                                         {
@@ -190 +157 @@
                                                                                 commitValue.apply( this, arguments );
                                                                                 var val = this.getValue();
                                                                                 val && ( extraStyles.height = val );
-                                                                        },
-                                                                        onChange : function()
-                                                                        {
-                                                                                var styles = this.getDialog().getContentElement( 'advanced', 'advStyles' ),
-                                                                                        value = this.getValue();
-                                                                                styles && styles.updateStyle( 'height', value );
                                                                         }
                                                                 },
                                                                 {

_source/plugins/fakeobjects/plugin.js

@@ -33 +33 @@
                                                 var height = match && match[1];
 
                                                 if ( width )
-                                                        realElement.attributes.width = width;
+                                                        realElement.attributes.width = CKEDITOR.tools.convertToPx( width );
 
                                                 if ( height )
-                                                        realElement.attributes.height = height;
+                                                        realElement.attributes.height = CKEDITOR.tools.convertToPx( height );
                                         }
                                 }
 

_source/core/tools.js

@@ -687 +687 @@
                 })(),
 
                 /**
+                 * Convert the specified CSS length value to the calculated pixel length inside this page.
+                 * <strong>Note:</strong> Percentage based value is left intact.
+                 * @param {String} cssLength CSS length value.
+                 */
+                convertToPx : ( function ()
+                        {
+                                var calculator;
+
+                                return function( cssLength )
+                                {
+                                        if ( !calculator )
+                                        {
+                                                calculator = CKEDITOR.dom.element.createFromHtml(
+                                                                '<div style="position:absolute;left:-9999px;' +
+                                                                'top:-9999px;margin:0px;padding:0px;border:0px;"' +
+                                                                '></div>', CKEDITOR.document );
+                                                CKEDITOR.document.getBody().append( calculator );
+                                        }
+
+                                        if ( !/%$/.test( cssLength ) )
+                                        {
+                                                calculator.setStyle( 'width', cssLength );
+                                                return calculator.$.clientWidth;
+                                        }
+
+                                        return cssLength;
+                                };
+                        } )(),
+
+                /**
                  * String specified by {@param str} repeats {@param times} times.
                  * @param str
                  * @param times