From b697daa59739e86657ab5b5a83782f75428ec31d Mon Sep 17 00:00:00 2001
From: vivid <brainlip@gmail.com>
Date: Wed, 25 May 2016 14:39:10 +0900
Subject: [PATCH] force dropdown position once

---
 dist/entry.css                         |  2 ++
 dist/entry.js                          | 30 ++++++----------
 dist/entry.min.js                      |  8 ++---
 src/css/components/block.less          |  2 ++
 src/workspace/field/dropdown.js        | 47 ++++++++++++--------------
 src/workspace/field/dropdownDynamic.js |  2 --
 6 files changed, 41 insertions(+), 50 deletions(-)

diff --git a/dist/entry.css b/dist/entry.css
index dd4847c281..e232e2c627 100644
--- 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
index 46affece3c..43997ebd4a 100644
--- 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
index 03bdaaf324..15eb112ae7 100644
--- a/dist/entry.min.js
+++ b/dist/entry.min.js
@@ -1946,12 +1946,12 @@ Entry.FieldColor.getWidgetColorList=function(){return["#FFFFFF #CCCCCC #C0C0C0 #
 (function(b){b.renderStart=function(){this.svgGroup&&$(this.svgGroup).remove();this instanceof Entry.FieldDropdownDynamic&&this._updateValue();var a=this._blockView;this.svgGroup=a.contentSvgGroup.elem("g",{class:"entry-field-dropdown"});this.textElement=this.svgGroup.elem("text",{x:2});this.textElement.textContent=this.getTextByValue(this.getValue());var b=this.textElement.getBBox();this.textElement.attr({style:"white-space: pre; font-size:"+this._FONT_SIZE+"px",y:.25*b.height});b=this.textElement.getComputedTextLength()+
 16;this._noArrow&&(b-=12);var d=this._CONTENT_HEIGHT;this._header=this.svgGroup.elem("rect",{width:b,height:d,y:-d/2,rx:this._ROUND,ry:this._ROUND,fill:"#fff","fill-opacity":.4});this.svgGroup.appendChild(this.textElement);this._noArrow||(a=this._arrowColor||a._schema.color,this._arrow=this.svgGroup.elem("polygon",{points:"0,-2.1 6.4,-2.1 3.2,2.1",fill:a,stroke:a,transform:"translate("+(b-11)+",0)"}));this._bindRenderOptions();this.box.set({x:0,y:0,width:b,height:d})};b.resize=function(){var a=this.textElement.getComputedTextLength()+
 18;this._noArrow?a-=14:this._arrow.attr({transform:"translate("+(a-11)+",0)"});this._header.attr({width:a});this.box.set({width:a});this._block.view.alignContent()};b.renderOptions=function(){var a=this;this._attachDisposeEvent();this.optionGroup=Entry.Dom("ul",{class:"entry-widget-dropdown",parent:$("body")});this.optionGroup.bind("mousedown touchstart",function(a){a.stopPropagation()});for(var b=this._contents.options,b=this._contents.options,d=0,e=b.length;d<e;d++){var f=b[d],g=f[0],f=f[1],h=Entry.Dom("li",
-{class:"rect",parent:this.optionGroup}),k=Entry.Dom("span",{class:"left",parent:h});Entry.Dom("span",{class:"right",parent:h}).text(g);this.getValue()==f&&k.text("\u2713");(function(b,c){b.bind("mousedown touchstart",function(a){a.stopPropagation()});b.bind("mouseup touchend",function(b){b.stopPropagation();a.applyValue(c);a.destroyOption();a._selectBlockView()})})(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};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}this.optionGroup.css({left:a.x,top:a.y})};b.applyValue=function(a){this.value!=a&&this.setValue(a);this.textElement.textContent=
-this.getTextByValue(a);this.resize()};b.getTextByValue=function(a){if(!a||"null"===a)return Lang.Blocks.no_target;for(var b=this._contents.options,d=0,e=b.length;d<e;d++){var f=b[d];if(f[1]==a)return f[0]}return Lang.Blocks.no_target}})(Entry.FieldDropdown.prototype);Entry.FieldDropdownDynamic=function(b,a,c){this._block=a.block;this._blockView=a;this.box=new Entry.BoxModel;this.svgGroup=null;this._contents=b;this._index=c;this._arrowColor=b.arrowColor;c=this._contents.menuName;Entry.Utils.isFunction(c)?this._menuGenerator=c:this._menuName=c;this._CONTENT_HEIGHT=b.dropdownHeight||a.getSkeleton().dropdownHeight||16;this._FONT_SIZE=b.fontSize||a.getSkeleton().fontSize||12;this._ROUND=b.roundValue||3;this.renderStart(a)};Entry.Utils.inherit(Entry.FieldDropdown,Entry.FieldDropdownDynamic);
+{class:"rect",parent:this.optionGroup}),k=Entry.Dom("span",{class:"left",parent:h});Entry.Dom("span",{class:"right",parent:h}).text(g);this.getValue()==f&&k.text("\u2713");(function(b,c){b.bind("mousedown touchstart",function(a){a.stopPropagation()});b.bind("mouseup touchend",function(b){b.stopPropagation();a.applyValue(c);a.destroyOption();a._selectBlockView()})})(h,f)}this._position()};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.x+=this.box.width/2-this.optionGroup.width()/2;this.optionGroup.css({left:a.x,top:a.y,width:this.optionGroup.width()+3})};b.applyValue=function(a){this.value!=a&&this.setValue(a);this.textElement.textContent=this.getTextByValue(a);this.resize()};b.getTextByValue=function(a){if(!a||
+"null"===a)return Lang.Blocks.no_target;for(var b=this._contents.options,d=0,e=b.length;d<e;d++){var f=b[d];if(f[1]==a)return f[0]}return Lang.Blocks.no_target}})(Entry.FieldDropdown.prototype);Entry.FieldDropdownDynamic=function(b,a,c){this._block=a.block;this._blockView=a;this.box=new Entry.BoxModel;this.svgGroup=null;this._contents=b;this._index=c;this._arrowColor=b.arrowColor;c=this._contents.menuName;Entry.Utils.isFunction(c)?this._menuGenerator=c:this._menuName=c;this._CONTENT_HEIGHT=b.dropdownHeight||a.getSkeleton().dropdownHeight||16;this._FONT_SIZE=b.fontSize||a.getSkeleton().fontSize||12;this._ROUND=b.roundValue||3;this.renderStart(a)};Entry.Utils.inherit(Entry.FieldDropdown,Entry.FieldDropdownDynamic);
 (function(b){b.constructor=Entry.FieldDropDownDynamic;b._updateValue=function(){var a=[];Entry.container&&(a=this._menuName?Entry.container.getDropdownList(this._menuName):this._menuGenerator());this._contents.options=a;var a=this._contents.options,b=this.getValue();b&&"null"!=b||(b=0!==a.length?a[0][1]:null);this.setValue(b)};b.renderOptions=function(){var a=this;this._attachDisposeEvent();this.optionGroup=Entry.Dom("ul",{class:"entry-widget-dropdown",parent:$("body")});this.optionGroup.bind("mousedown touchstart",
 function(a){a.stopPropagation()});var b;b=this._menuName?Entry.container.getDropdownList(this._contents.menuName):this._menuGenerator();this._contents.options=b;for(var d=0;d<b.length;d++){var e=b[d],f=e[0],e=e[1],g=Entry.Dom("li",{class:"rect",parent:this.optionGroup}),h=Entry.Dom("span",{class:"left",parent:g});Entry.Dom("span",{class:"right",parent:g}).text(f);this.getValue()==e&&h.text("\u2713");(function(b,c){b.mousedown(function(a){a.stopPropagation()});b.mouseup(function(b){b.stopPropagation();
-a.applyValue(c);a.destroyOption();a._selectBlockView()})})(g,e)}this._position(!0);this.optionGroup.css("width",this.optionGroup.width()+3);this._position()}})(Entry.FieldDropdownDynamic.prototype);Entry.FieldImage=function(b,a,c){this._block=a.block;this._blockView=a;this._content=b;this.box=new Entry.BoxModel;this._size=b.size;this._highlightColor=b.highlightColor?b.highlightColor:"#F59900";this._position=b.position;this._imgElement=this._path=this.svgGroup=null;this._index=c;this.setValue(null);this.renderStart()};Entry.Utils.inherit(Entry.Field,Entry.FieldImage);
+a.applyValue(c);a.destroyOption();a._selectBlockView()})})(g,e)}this._position()}})(Entry.FieldDropdownDynamic.prototype);Entry.FieldImage=function(b,a,c){this._block=a.block;this._blockView=a;this._content=b;this.box=new Entry.BoxModel;this._size=b.size;this._highlightColor=b.highlightColor?b.highlightColor:"#F59900";this._position=b.position;this._imgElement=this._path=this.svgGroup=null;this._index=c;this.setValue(null);this.renderStart()};Entry.Utils.inherit(Entry.Field,Entry.FieldImage);
 (function(b){b.renderStart=function(){this.svgGroup&&this.svgGroup.remove();this._imgUrl=this._block.deletable===Entry.Block.DELETABLE_FALSE_LIGHTEN?this._content.img.replace(".png","_un.png"):this._content.img;this.svgGroup=this._blockView.contentSvgGroup.elem("g");this._imgElement=this.svgGroup.elem("image",{href:this._imgUrl,x:0,y:-.5*this._size,width:this._size,height:this._size});this.box.set({x:this._size,y:0,width:this._size,height:this._size})}})(Entry.FieldImage.prototype);Entry.FieldIndicator=function(b,a,c){this._block=a.block;this._blockView=a;this.box=new Entry.BoxModel;this._size=b.size;this._imgUrl=this._block.deletable===Entry.Block.DELETABLE_FALSE_LIGHTEN?b.img.replace(".png","_un.png"):b.img;this._boxMultiplier=b.boxMultiplier||2;this._highlightColor=b.highlightColor?b.highlightColor:"#F59900";this._position=b.position;this._index=c;this._imgElement=this._path=this.svgGroup=null;this.setValue(null);this.renderStart()};Entry.Utils.inherit(Entry.Field,Entry.FieldIndicator);
 (function(b){b.renderStart=function(){this.svgGroup&&this.svgGroup.remove();this.svgGroup=this._blockView.contentSvgGroup.elem("g");this._imgElement=this.svgGroup.elem("image",{href:Entry.mediaFilePath+this._imgUrl,x:this._position?-1*this._size:0,y:-1*this._size,width:2*this._size,height:2*this._size});var a="m 0,-%s a %s,%s 0 1,1 -0.1,0 z".replace(/%s/gi,this._size);this._path=this.svgGroup.elem("path",{d:a,stroke:"none",fill:"none"});this.box.set({width:this._size*this._boxMultiplier+(this._position?
 -this._size:0),height:this._size*this._boxMultiplier})};b.enableHighlight=function(){var a=this._path.getTotalLength(),b=this._path;this._path.attr({stroke:this._highlightColor,strokeWidth:2,"stroke-linecap":"round","stroke-dasharray":a+" "+a,"stroke-dashoffset":a});setInterval(function(){b.attr({"stroke-dashoffset":a}).animate({"stroke-dashoffset":0},300)},1400,mina.easeout);setTimeout(function(){setInterval(function(){b.animate({"stroke-dashoffset":-a},300)},1400,mina.easeout)},500)}})(Entry.FieldIndicator.prototype);Entry.Keyboard={};Entry.FieldKeyboard=function(b,a,c){this._block=a.block;this._blockView=a;this.box=new Entry.BoxModel;this.svgGroup=null;this.position=b.position;this._contents=b;this._index=c;this.setValue(String(this.getValue()));this._optionVisible=!1;this.renderStart(a)};Entry.Utils.inherit(Entry.Field,Entry.FieldKeyboard);
diff --git a/src/css/components/block.less b/src/css/components/block.less
index 8ca2a27f15..bf53155219 100644
--- 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
index 5d20a23567..db0a655999 100644
--- 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
index 06330685d8..0379bca226 100644
--- 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();
     };