Changeset 11944

Timestamp:

01/03/08 12:25:02 (8 months ago)

Author:

peller

Message:

Correct DnD/dropdown bidi placement. Fixes #4369, #4228. Also some size reductions. !strict

Files:

• dijit/trunk/_base/place.js (modified) (7 diffs)
• dojo/trunk/_base/html.js (modified) (2 diffs)

dijit/trunk/_base/place.js

@@ -12 +12 @@
         // get viewport size
         var w = 0, h = 0;
+        var de = _document.documentElement;
+        var dew = de.clientWidth, deh = de.clientHeight;
         if(dojo.isMozilla){
                 // mozilla
@@ -19 +21 @@
                 // check DTD to see whether body or documentElement returns the viewport dimensions using this algorithm:
                 var minw, minh, maxw, maxh;
-                if(_document.body.clientWidth>_document.documentElement.clientWidth){
-                        minw = _document.documentElement.clientWidth;
-                        maxw = _document.body.clientWidth;
+                var dbw = _document.body.clientWidth;
+                if(dbw > dew){
+                        minw = dew;
+                        maxw = dbw;
                 }else{
-                        maxw = _document.documentElement.clientWidth;
-                        minw = _document.body.clientWidth;
-                }
-                if(_document.body.clientHeight>_document.documentElement.clientHeight){
-                        minh = _document.documentElement.clientHeight;
-                        maxh = _document.body.clientHeight;
+                        maxw = dew;
+                        minw = dbw;
+                }
+                var dbh = _document.body.clientHeight;
+                if(dbh > deh){
+                        minh = deh;
+                        maxh = dbh;
                 }else{
-                        maxh = _document.documentElement.clientHeight;
-                        minh = _document.body.clientHeight;
+                        maxh = deh;
+                        minh = dbh;
                 }
                 w = (maxw > _window.innerWidth) ? minw : maxw;
@@ -41 +45 @@
                 w = _window.innerWidth;
                 h = _window.innerHeight;
-        }else if(dojo.isIE && _document.documentElement && _document.documentElement.clientHeight){
-                w = _document.documentElement.clientWidth;
-                h = _document.documentElement.clientHeight;
+        }else if(dojo.isIE && de && deh){
+                w = dew;
+                h = deh;
         }else if(dojo.body().clientWidth){
                 // IE5, Opera
@@ -104 +108 @@
         }
 
-        var best=null;
-        for(var i=0; i<choices.length; i++){
-                var corner = choices[i].corner;
-                var pos = choices[i].pos;
+        var best = null;
+        dojo.some(choices, function(choice){
+                var corner = choice.corner;
+                var pos = choice.pos;
 
                 // configure node to be displayed in given position relative to button
@@ -113 +117 @@
                 // a tooltips size changes based on position, due to triangle)
                 if(layoutNode){
-                        layoutNode(node, choices[i].aroundCorner, corner);
+                        layoutNode(node, choice.aroundCorner, corner);
                 }
 
                 // get node's size
-                var oldDisplay = node.style.display;
-                var oldVis = node.style.visibility;
-                node.style.visibility = "hidden";
-                node.style.display = "";
+                var style = node.style;
+                var oldDisplay = style.display;
+                var oldVis = style.visibility;
+                style.visibility = "hidden";
+                style.display = "";
                 var mb = dojo.marginBox(node);
-                node.style.display = oldDisplay;
-                node.style.visibility = oldVis;
+                style.display = oldDisplay;
+                style.visibility = oldVis;
 
                 // coordinates and size of node with specified corner placed at pos,
                 // and clipped by viewport
-                var startX = (corner.charAt(1)=='L' ? pos.x : Math.max(view.l, pos.x - mb.w)),
-                        startY = (corner.charAt(0)=='T' ? pos.y : Math.max(view.t, pos.y -  mb.h)),
-                        endX = (corner.charAt(1)=='L' ? Math.min(view.l+view.w, startX+mb.w) : pos.x),
-                        endY = (corner.charAt(0)=='T' ? Math.min(view.t+view.h, startY+mb.h) : pos.y),
-                        width = endX-startX,
-                        height = endY-startY,
-                        overflow = (mb.w-width) + (mb.h-height);
-
-                if(best==null || overflow<best.overflow){
+                var startX = (corner.charAt(1) == 'L' ? pos.x : Math.max(view.l, pos.x - mb.w)),
+                        startY = (corner.charAt(0) == 'T' ? pos.y : Math.max(view.t, pos.y -  mb.h)),
+                        endX = (corner.charAt(1) == 'L' ? Math.min(view.l + view.w, startX + mb.w) : pos.x),
+                        endY = (corner.charAt(0) == 'T' ? Math.min(view.t + view.h, startY + mb.h) : pos.y),
+                        width = endX - startX,
+                        height = endY - startY,
+                        overflow = (mb.w - width) + (mb.h - height);
+
+                if(best == null || overflow < best.overflow){
                         best = {
                                 corner: corner,
-                                aroundCorner: choices[i].aroundCorner,
-                                x: (!dojo._isBodyLtr() && dojo.isIE && startX < 0) ? document.body.clientWidth + startX : startX,
+                                aroundCorner: choice.aroundCorner,
+                                x: startX,
                                 y: startY,
                                 w: width,
@@ -146 +151 @@
                         };
                 }
-                if(overflow==0){
-                        break;
-                }
-        }
+                return !overflow;
+        });
 
         node.style.left = best.x + "px";
@@ -194 +197 @@
                         corner: aroundCorners[nodeCorner],
                         pos: {
-                                x: aroundNodePos.x + (nodeCorner.charAt(1)=='L' ? 0 : aroundNodeW),
-                                y: aroundNodePos.y + (nodeCorner.charAt(0)=='T' ? 0 : aroundNodeH)
+                                x: aroundNodePos.x + (nodeCorner.charAt(1) == 'L' ? 0 : aroundNodeW),
+                                y: aroundNodePos.y + (nodeCorner.charAt(0) == 'T' ? 0 : aroundNodeH)
                         }
                 });

dojo/trunk/_base/html.js

@@ -842 +842 @@
                 // will offset to right when there is a horizontal scrollbar.
                 if(dojo.isIE && !dojo._isBodyLtr()){
-                        var de = dojo.doc.documentElement;
-                        return scrollLeft + de.clientWidth - de.scrollWidth; // Integer
+                        var de = dojo.doc.body;
+                        return de.clientWidth - de.offsetWidth; // Integer
                 }
                 return scrollLeft; // Integer
@@ -1026 +1026 @@
                         // via getAttribute()?
                         var prop = _attrProps[name.toLowerCase()];
-                        if(prop){
-                                return node[prop];
-                        }else{
-                                return _hasAttr(node, name) ? node.getAttribute(name) : null;
-                        }
+                        return prop ? node[prop] :
+                                _hasAttr(node, name) ? node.getAttribute(name) : null;
                 }
         }