U: fix #12 & #15

aralejs · Oct 29, 2013 · 707eb9c · 707eb9c
1 parent 4444264
commit 707eb9c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/dist/mask-debug.js b/dist/mask-debug.js
@@ -60,11 +60,6 @@ define("arale/overlay/1.1.4/overlay-debug", [ "$-debug", "arale/position/1.0.1/p
                 // 基准定位元素的定位点，默认为左上角
                 baseXY: [ 0, 0 ]
             },
-            style: {
-                position: "absolute",
-                left: "-9999px",
-                top: "-9999px"
-            },
             // 父元素
             parentNode: document.body
         },
@@ -86,6 +81,16 @@ define("arale/overlay/1.1.4/overlay-debug", [ "$-debug", "arale/position/1.0.1/p
             this._setupShim();
             // 窗口resize时，重新定位浮层
             this._setupResize();
+            this.after("render", function() {
+                var _pos = this.element.css("position");
+                if (_pos === "static" || _pos === "relative") {
+                    this.element.css({
+                        position: "absolute",
+                        left: "-9999px",
+                        top: "-9999px"
+                    });
+                }
+            });
             // 统一在显示之后重新设定位置
             this.after("show", function() {
                 that._setPosition();

diff --git a/dist/mask.js b/dist/mask.js
diff --git a/dist/overlay-debug.js b/dist/overlay-debug.js
@@ -20,11 +20,6 @@ define("arale/overlay/1.1.4/overlay-debug", [ "$-debug", "arale/position/1.0.1/p
                 // 基准定位元素的定位点，默认为左上角
                 baseXY: [ 0, 0 ]
             },
-            style: {
-                position: "absolute",
-                left: "-9999px",
-                top: "-9999px"
-            },
             // 父元素
             parentNode: document.body
         },
@@ -46,6 +41,16 @@ define("arale/overlay/1.1.4/overlay-debug", [ "$-debug", "arale/position/1.0.1/p
             this._setupShim();
             // 窗口resize时，重新定位浮层
             this._setupResize();
+            this.after("render", function() {
+                var _pos = this.element.css("position");
+                if (_pos === "static" || _pos === "relative") {
+                    this.element.css({
+                        position: "absolute",
+                        left: "-9999px",
+                        top: "-9999px"
+                    });
+                }
+            });
             // 统一在显示之后重新设定位置
             this.after("show", function() {
                 that._setPosition();

diff --git a/dist/overlay.js b/dist/overlay.js
diff --git a/src/overlay.js b/src/overlay.js
@@ -30,12 +30,6 @@ define(function(require, exports, module) {
                 baseXY: [0, 0]
             },
 
-            style: {
-                position: 'absolute',
-                left: '-9999px',
-                top: '-9999px'
-            },
-
             // 父元素
             parentNode: document.body
         },
@@ -60,6 +54,17 @@ define(function(require, exports, module) {
             this._setupShim();
             // 窗口resize时，重新定位浮层
             this._setupResize();
+
+            this.after('render', function() {
+                var _pos = this.element.css('position');
+                if (_pos === 'static' || _pos === 'relative') {
+                    this.element.css({
+                        position: 'absolute',
+                        left: '-9999px',
+                        top: '-9999px'
+                    });
+                }
+            });
             // 统一在显示之后重新设定位置
             this.after('show', function() {
                 that._setPosition();
@@ -87,7 +92,10 @@ define(function(require, exports, module) {
 
             // 在定位时，为避免元素高度不定，先显示出来
             if (isHidden) {
-                this.element.css({ visibility: 'hidden', display: 'block' });
+                this.element.css({
+                    visibility: 'hidden',
+                    display: 'block'
+                });
             }
 
             Position.pin({