Changeset 7566

Timestamp:

03/09/07 02:27:27 (22 months ago)

Author:

alex

Message:

fixes #2576

Files:

• branches/0.4/src/html/layout.js (modified) (2 diffs)
• trunk/src/html/layout.js (modified) (2 diffs)

branches/0.4/src/html/layout.js

@@ -249 +249 @@
         var h = dojo.render.html;
         var bs = dojo.html.boxSizing;
-        if(((h.ie)||(h.opera)) && node.nodeName!="IMG"){ 
+        if(((h.ie)||(h.opera)) && node.nodeName.toLowerCase() != "img"){ 
                 var cm = document["compatMode"];
                 if((cm == "BackCompat")||(cm == "QuirksMode")){
@@ -258 +258 @@
         }else{
                 if(arguments.length == 0){ node = document.documentElement; }
-                var sizing = dojo.html.getStyle(node, "-moz-box-sizing");
-                if(!sizing){ sizing = dojo.html.getStyle(node, "box-sizing"); }
+                var sizing;
+                if(!h.ie){
+                        sizing = dojo.html.getStyle(node, "-moz-box-sizing");
+                        if(!sizing){ 
+                                sizing = dojo.html.getStyle(node, "box-sizing");
+                        }
+                }
                 return (sizing ? sizing : bs.CONTENT_BOX);      //      string
         }

trunk/src/html/layout.js

@@ -258 +258 @@
         var h = dojo.render.html;
         var bs = dojo.html.boxSizing;
-        if(((h.ie)||(h.opera)) && node.nodeName!="IMG"){ 
+        if(((h.ie)||(h.opera)) && node.nodeName.toLowerCase() != "img"){ 
                 var cm = document["compatMode"];
                 if((cm == "BackCompat")||(cm == "QuirksMode")){
@@ -267 +267 @@
         }else{
                 if(arguments.length == 0){ node = document.documentElement; }
-                var sizing = dojo.html.getStyle(node, "-moz-box-sizing");
-                if(!sizing){ sizing = dojo.html.getStyle(node, "box-sizing"); }
+                var sizing;
+                if(!h.ie){
+                        sizing = dojo.html.getStyle(node, "-moz-box-sizing");
+                        if(!sizing){ 
+                                sizing = dojo.html.getStyle(node, "box-sizing");
+                        }
+                }
                 return (sizing ? sizing : bs.CONTENT_BOX);      //      string
         }