Pull request #2619: 无JIRA任务 dom.js

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '9857dab14e17cc264826359c38a3f8f4f4383174':
  update
  feature: dom

src/base/layer/layer.popup.js

@@ -185,7 +185,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
     setDirection: function (direction, position) {
         var o = this.options;
         if (o.showArrow) {
-            var style, wrapperStyle, placeholderStyle;
+            var style = {}, wrapperStyle = {}, placeholderStyle = {};
             var adjustXOffset = position.adjustXOffset || 0;
             var adjustYOffset = position.adjustYOffset || 0;
             var bodyBounds = BI.Widget._renderEngine.createElement("body").bounds();

src/core/platform/web/dom.js

@@ -628,20 +628,20 @@
                     return pos;
                 default :
                     if (BI.DOM.isBottomSpaceLarger(combo)) {
-                        pos = BI.DOM.getBottomAdaptPosition(combo, popup, extraHeight, needAdaptHeight);
+                        top = BI.DOM.getBottomAdaptPosition(combo, popup, extraHeight, needAdaptHeight).top;
                         firstDir = "bottom";
                     } else {
-                        pos = BI.DOM.getTopAdaptPosition(combo, popup, extraHeight, needAdaptHeight);
+                        top = BI.DOM.getTopAdaptPosition(combo, popup, extraHeight, needAdaptHeight).top;
                         firstDir = "top";
                     }
                     if (leftRight[0] === "right") {
-                        left = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth, needAdaptHeight).left;
-                        pos.left = left;
+                        pos = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth, needAdaptHeight);
+                        pos.top = top;
                         pos.dir = firstDir + "," + pos.dir;
                         return pos;
                     }
-                    left = BI.DOM.getRightAlignPosition(combo, popup, extraWidth).left;
-                    pos.left = left;
+                    pos = BI.DOM.getRightAlignPosition(combo, popup, extraWidth);
+                    pos.top = top;
                     pos.dir = firstDir + "," + pos.dir;
                     return pos;
             }