Changeset 13146

Timestamp:

03/19/08 13:01:27 (8 months ago)

Author:

alex

Message:

merging patch from Bryan Forbes to fix FontChoice? exception. Fixes #6257

Files:

• dijit/trunk/_editor/plugins/FontChoice.js (modified) (1 diff)

dijit/trunk/_editor/plugins/FontChoice.js

@@ -124 +124 @@
 //console.log("mapped to " + map[value]);
                                         value = map[value] || value;
-                                }else if(_c == "fontSize" && value.indexOf("px") != -1){
-                                        var pixels = parseInt(value);
+                                }else if(_c == "fontSize"){
+                                        var pixels = value;
+                                        if(dojo.isString(pixels) && pixels.indexOf("px") != -1){
+                                                pixels = parseInt(pixels);
+                                        }
                                         value = {10:1, 13:2, 16:3, 18:4, 24:5, 32:6, 48:7}[pixels] || value;
                                 }