Changeset 4767

Timestamp:

12/20/09 17:23:49 (3 years ago)

Author:

garry.yao

Message:

Better performance results for convertToPx method.

File:

• CKEditor/branches/features/paste/_source/plugins/pastefromword/filter/default.js (modified) (2 diffs)

CKEditor/branches/features/paste/_source/plugins/pastefromword/filter/default.js

@@ -238 +238 @@
                         },
 
-                        convertToPx : function( cssLength )
+                        // Convert various length units to 'px' in ignorance of DPI.
+                        convertToPx : ( function ()
                         {
-                                // Convert to 'px' in ignorance of DPI.
-                                if( cssLengthRelativeUnit.test( cssLength ) )
-                                {
-                                        var val,
-                                                calculator = CKEDITOR.dom.element.createFromHtml(
-                                                                                '<div style="position:absolute;left:-9999px;' +
-                                                                                'top:-9999px;margin:0px;padding:0px;border:0px;' +
-                                                                                'width:' + cssLength + '" ' +
-                                                                                '></div>' );
-                                        CKEDITOR.document.getBody().append( calculator );
-                                        val = calculator.$.clientWidth;
-                                        calculator.remove();
-                                        return val + 'px';
-                                }
-                                return cssLength;
-                        },
+                                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( cssLength.indexOf( '%' ) == -1 )
+                                        {
+                                                calculator.setStyle( 'width', cssLength );
+                                                return calculator.$.clientWidth + 'px';
+                                        }
+                                        
+                                        return cssLength;
+                                };
+                        } )(),
 
                         listDtdParents : CKEDITOR.dtd.parentOf( 'ol' )
@@ -1026 +1028 @@
                 editor.fire( 'beforeCleanWord', { filter : dataFilter } );
 
+                console.time( 'word clean' );
                 data = dataProcessor.toHtml( data, false );
+                console.timeEnd( 'word clean' );
 
                 /* Below post processing those things that are unable to delivered by filter rules. */