force dropdown position once

entrylabs · May 25, 2016 · b697daa · b697daa
1 parent 2cf562a
commit b697daa
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 50 deletions.
diff --git a/dist/entry.css b/dist/entry.css
@@ -601,6 +601,8 @@ svg .svgBlockGroup text {
   color: #000;
   z-index: 1001;
   overflow: auto;
+  left: 0;
+  top: 0;
 }
 .entry-widget-dropdown .rect {
   height: 20px;

diff --git a/dist/entry.js b/dist/entry.js
@@ -16841,27 +16841,21 @@ Entry.Utils.inherit(Entry.Field, Entry.FieldDropdown);
         });
       })(h, f);
     }
-    this._position(!0);
-    this.optionGroup.css("width", this.optionGroup.width() + 3);
     this._position();
   };
-  b._position = function(a) {
-    if (a) {
-      a = {x:0, y:0};
+  b._position = function() {
+    var a = this.getAbsolutePosFromDocument();
+    a.y += this.box.height / 2;
+    var b = $(document).height(), d = this.optionGroup.height();
+    if (b < a.y + d) {
+      a.x += this.box.width + 1;
+      var b = this.getAbsolutePosFromBoard(), e = this._blockView.getBoard().svgDom.height(), e = e - (e - b.y);
+      e - 20 < d && this.optionGroup.height(e - e % 20);
+      a.y -= this.optionGroup.height();
     } else {
-      a = this.getAbsolutePosFromDocument();
-      a.y += this.box.height / 2;
-      var b = $(document).height(), d = this.optionGroup.height();
-      if (b < a.y + d) {
-        a.x += this.box.width + 1;
-        var b = this.getAbsolutePosFromBoard(), e = this._blockView.getBoard().svgDom.height(), e = e - (e - b.y);
-        e - 20 < d && this.optionGroup.height(e - e % 20);
-        a.y -= this.optionGroup.height();
-      } else {
-        a.x += this.box.width / 2 - this.optionGroup.width() / 2;
-      }
+      a.x += this.box.width / 2 - this.optionGroup.width() / 2;
     }
-    this.optionGroup.css({left:a.x, top:a.y});
+    this.optionGroup.css({left:a.x, top:a.y, width:this.optionGroup.width() + 3});
   };
   b.applyValue = function(a) {
     this.value != a && this.setValue(a);
@@ -16933,8 +16927,6 @@ Entry.Utils.inherit(Entry.FieldDropdown, Entry.FieldDropdownDynamic);
         });
       })(g, e);
     }
-    this._position(!0);
-    this.optionGroup.css("width", this.optionGroup.width() + 3);
     this._position();
   };
 })(Entry.FieldDropdownDynamic.prototype);

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/src/css/components/block.less b/src/css/components/block.less
@@ -149,6 +149,8 @@ svg .svgBlockGroup text {
     color: #000;
     z-index: 1001;
     overflow: auto;
+    left: 0;
+    top: 0;
 
     .rect {
         height: 20px;

diff --git a/src/workspace/field/dropdown.js b/src/workspace/field/dropdown.js
@@ -183,40 +183,37 @@ Entry.Utils.inherit(Entry.Field, Entry.FieldDropdown);
                 });
             })(element, value);
         }
-        this._position(true);
-        this.optionGroup.css('width', this.optionGroup.width() + 3);
         this._position();
     };
 
-    p._position = function(reset) {
-        if (!reset) {
-            //inspect enough space below
-            var pos = this.getAbsolutePosFromDocument();
-            pos.y += this.box.height/2;
+    p._position = function() {
+        //inspect enough space below
+        var pos = this.getAbsolutePosFromDocument();
+        pos.y += this.box.height/2;
 
-            var documentHeight = $(document).height();
-            var optionGroupHeight = this.optionGroup.height();
+        var documentHeight = $(document).height();
+        var optionGroupHeight = this.optionGroup.height();
 
-            //not enough space below
-            if (documentHeight < pos.y + optionGroupHeight) {
-                pos.x += this.box.width + 1;
+        //not enough space below
+        if (documentHeight < pos.y + optionGroupHeight) {
+            pos.x += this.box.width + 1;
 
-                var relPos = this.getAbsolutePosFromBoard();
-                var domHeight = this._blockView.getBoard().svgDom.height();
-                domHeight -=  domHeight - relPos.y;
+            var relPos = this.getAbsolutePosFromBoard();
+            var domHeight = this._blockView.getBoard().svgDom.height();
+            domHeight -=  domHeight - relPos.y;
 
-                if (domHeight - 20 < optionGroupHeight) {
-                    domHeight -= domHeight % 20;
-                    this.optionGroup.height(domHeight)
-                }
+            if (domHeight - 20 < optionGroupHeight) {
+                domHeight -= domHeight % 20;
+                this.optionGroup.height(domHeight)
+            }
 
-                pos.y -= this.optionGroup.height();
-            } else pos.x += this.box.width/2 - this.optionGroup.width()/2;
-        } else {
-            pos = { x: 0, y: 0 };
-        }
+            pos.y -= this.optionGroup.height();
+        } else pos.x += this.box.width/2 - this.optionGroup.width()/2;
 
-        this.optionGroup.css({left: pos.x, top: pos.y});
+        this.optionGroup.css({
+            left: pos.x, top: pos.y,
+            width: this.optionGroup.width() + 3
+        });
     };
 
     p.applyValue = function(value) {

diff --git a/src/workspace/field/dropdownDynamic.js b/src/workspace/field/dropdownDynamic.js
@@ -125,8 +125,6 @@ Entry.Utils.inherit(Entry.FieldDropdown, Entry.FieldDropdownDynamic);
                 });
             })(element, value);
         }
-        this._position(true);
-        this.optionGroup.css('width', this.optionGroup.width() +3);
         this._position();
     };