Changeset 12376

Timestamp:

02/11/08 15:24:57 (11 months ago)

Author:

peller

Message:

Reduce toPixelValue with a regexp, remove redundant return statements. Refs #3961 !strict

Files:

• dojo/trunk/_base/html.js (modified) (3 diffs)

dojo/trunk/_base/html.js

@@ -380 +380 @@
                 width: true, height: true, left: true, top: true
         };
+        var _pixelRegExp = /^(?:margin*|padding*|width|height|max*|min*|offset*)/ /*|border*/;
         var _toStyleValue = function(node, type, value){
                 type = type.toLowerCase();
-                if(_pixelNamesCache[type] === true){
-                        return dojo._toPixelValue(node, value)
-                }else if(_pixelNamesCache[type] === false){
-                        return value;
-                }else{
-                        if(dojo.isOpera && type == "cssText"){
-                                // FIXME: add workaround for #2855 here
-                        }
-                        if(
-                                type.indexOf("margin") >= 0 ||
-                                // type.indexOf("border") >= 0 ||
-                                type.indexOf("padding") >= 0 ||
-                                type.indexOf("width") >= 0 ||
-                                type.indexOf("height") >= 0 ||
-                                type.indexOf("max") >= 0 ||
-                                type.indexOf("min") >= 0 ||
-                                type.indexOf("offset") >= 0
-                        ){
-                                _pixelNamesCache[type] = true;
-                                return dojo._toPixelValue(node, value)
-                        }else{
-                                _pixelNamesCache[type] = false;
-                                return value;
-                        }
-                }
+                if(!(type in _pixelNamesCache)){
+//                      if(dojo.isOpera && type == "cssText"){
+// FIXME: add workaround for #2855 here
+//                      }
+                        _pixelNamesCache[type] = _pixelRegExp.test(type);
+                }
+                return _pixelNamesCache[type] ? dojo._toPixelValue(node, value) : value;
+
         }
 
@@ -552 +536 @@
                         r=px(n, s.marginRight),
                         b=px(n, s.marginBottom);
-                if (dojo.isSafari && (s.position != "absolute")){
+                if(dojo.isSafari && (s.position != "absolute")){
                         // FIXME: Safari's version of the computed right margin
                         // is the space between our right edge and the right edge 
@@ -794 +778 @@
         
         var _sumAncestorProperties = function(node, prop){
-                if(!(node = (node||0).parentNode)){return 0}; //FIXME: 0.parentNode?
+                if(!(node = (node||0).parentNode)){return 0};
                 var val, retVal = 0, _b = dojo.body();
                 while(node && node.style){