Changeset 11955

Timestamp:

01/04/08 13:01:53 (8 months ago)

Author:

peller

Message:

Fixes bidi in quirks mode (thanks, makin) Fixes #3721 and backs out change from [11944] Refs #5509. Plus some size reductions. !strict

Files:

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

dojo/trunk/_base/html.js

@@ -41 +41 @@
                         }else{
                                 var eles = _d.all[id];
-                                if(!eles){ return; }
-                                if(!eles.length){ return eles; }
+                                if(!eles || !eles.length){ return eles; }
                                 // if more than 1, choose first with the correct id
                                 var i=0;
@@ -55 +54 @@
 }else{
         dojo.byId = function(id, doc){
-                if(dojo.isString(id)){
-                        return (doc || dojo.doc).getElementById(id);
-                }else{
-                        return id; // DomNode
-                }
+                return dojo.isString(id) ? (doc || dojo.doc).getElementById(id) : id; // DomNode
         }
 }
@@ -190 +185 @@
                                 if(refNode.firstChild){
                                         return _insertBefore(node, refNode.firstChild); //      boolean
-                                }else{
-                                        refNode.appendChild(node);
-                                        return true;    //      boolean
                                 }
-                                break;
+                                // else fallthrough...
                         default: // aka: last
                                 refNode.appendChild(node);
@@ -222 +214 @@
                 var _dcm = document.compatMode;
                 // client code may have to adjust if compatMode varies across iframes
-                dojo.boxModel = (_dcm=="BackCompat")||(_dcm=="QuirksMode")||(dojo.isIE<6) ? "border-box" : "content-box";
+                dojo.boxModel = _dcm == "BackCompat" || _dcm == "QuirksMode" || dojo.isIE<6 ? "border-box" : "content-box"; // FIXME: remove IE < 6 support?
         }
 
@@ -334 +326 @@
         =====*/
 
-        dojo._getOpacity = (dojo.isIE ? function(node){
-                        try{
-                                return (node.filters.alpha.opacity / 100); // Number
-                        }catch(e){
-                                return 1; // Number
-                        }
-                } : function(node){
-                        return dojo.getComputedStyle(node).opacity;
-                }
-        );
+        dojo._getOpacity = dojo.isIE ? function(node){
+                try{
+                        return node.filters.alpha.opacity / 100; // Number
+                }catch(e){
+                        return 1; // Number
+                }
+        } : function(node){
+                return dojo.getComputedStyle(node).opacity;
+        };
 
         /*=====
@@ -359 +350 @@
         =====*/
 
-        dojo._setOpacity = (dojo.isIE ? function(/*DomNode*/node, /*Number*/opacity){
-                        if(opacity == 1){
-                                // on IE7 Alpha(Filter opacity=100) makes text look fuzzy so remove it altogether (bug #2661)
-                                node.style.cssText = node.style.cssText.replace(/FILTER:[^;]*;?/i, "");
-                                if(node.nodeName.toLowerCase() == "tr"){
-                                        dojo.query("> td", node).forEach(function(i){
-                                                i.style.cssText = i.style.cssText.replace(/FILTER:[^;]*;?/i, "");
-                                        });
-                                }
-                        }else{
-                                var o = "Alpha(Opacity="+(opacity*100)+")";
-                                node.style.filter = o;
-                        }
+        dojo._setOpacity = dojo.isIE ? function(/*DomNode*/node, /*Number*/opacity){
+                if(opacity == 1){
+                        // on IE7 Alpha(Filter opacity=100) makes text look fuzzy so remove it altogether (bug #2661)
+                        var filterRE = /FILTER:[^;]*;?/i;
+                        node.style.cssText = node.style.cssText.replace(filterRE, "");
                         if(node.nodeName.toLowerCase() == "tr"){
                                 dojo.query("> td", node).forEach(function(i){
-                                        i.style.filter = o;
+                                        i.style.cssText = i.style.cssText.replace(filterRE, "");
                                 });
                         }
-                        return opacity;
-                } : function(node, opacity){
-                        return node.style.opacity = opacity;
-                }
-        );
+                }else{
+                        var o = "Alpha(Opacity="+ opacity * 100 +")";
+                        node.style.filter = o;
+                }
+                if(node.nodeName.toLowerCase() == "tr"){
+                        dojo.query("> td", node).forEach(function(i){
+                                i.style.filter = o;
+                        });
+                }
+                return opacity;
+        } : function(node, opacity){
+                return node.style.opacity = opacity;
+        };
 
         var _pixelNamesCache = {
@@ -397 +388 @@
                         }
                         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)
+                                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;
@@ -669 +660 @@
                 //      u: optional. unit measure to use for other measures. Defaults to "px".
                 u = u || "px";
-                with(node.style){
-                        if(!isNaN(l)){ left = l+u; }
-                        if(!isNaN(t)){ top = t+u; }
-                        if(w>=0){ width = w+u; }
-                        if(h>=0){ height = h+u; }
-                }
+                var s = node.style;
+                if(!isNaN(l)){ s.left = l+u; }
+                if(!isNaN(t)){ s.top = t+u; }
+                if(w>=0){ s.width = w+u; }
+                if(h>=0){ s.height = h+u; }
         }
 
@@ -826 +816 @@
 
                 var de = dojo.doc.documentElement;
-                if(dojo.isIE >= 7){
-                        return {x: de.getBoundingClientRect().left, y: de.getBoundingClientRect().top}; // Object
-                }else{
+//FIXME: use this instead?                      var de = d.compatMode == "BackCompat" ? d.body : d.documentElement;
+
+                return (dojo.isIE >= 7) ?
+                        {x: de.getBoundingClientRect().left, y: de.getBoundingClientRect().top}
+                :
                         // IE 6.0
-                        return {x: dojo._isBodyLtr() || window.parent == window ?
+                        {x: dojo._isBodyLtr() || window.parent == window ?
                                 de.clientLeft : de.offsetWidth - de.clientWidth - de.clientLeft, 
                                 y: de.clientTop}; // Object
-                }
         };
         
@@ -841 +832 @@
                 // must call this function to fix this error, otherwise the position
                 // will offset to right when there is a horizontal scrollbar.
+                var d = dojo.doc;
                 if(dojo.isIE && !dojo._isBodyLtr()){
-                        var de = dojo.doc.body;
-                        return de.clientWidth - de.offsetWidth; // Integer
+                        var de = d.compatMode == "BackCompat" ? d.body : d.documentElement;
+                        return scrollLeft + de.clientWidth - de.scrollWidth; // Integer
                 }
                 return scrollLeft; // Integer
         }
-        
+
         dojo._abs = function(/*DomNode*/node, /*Boolean?*/includeScroll){
                 //      summary: