Merge pull request #3256 from rachel-fenichel/cp_3202

Cherry-pick #3202 and bump patch version
google · Oct 15, 2019 · 921e00b · 921e00b
2 parents 15a6fa7 + 09687cb
commit 921e00b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js
@@ -263,7 +263,7 @@ Blockly.DropDownDiv.showPositionedByBlock = function(field, block,
  */
 Blockly.DropDownDiv.showPositionedByField = function(field,
  opt_onHide, opt_secondaryYOffset) {
- var position = field.fieldGroup_.getBoundingClientRect();
+ var position = field.getSvgRoot().getBoundingClientRect();
  // If we can fit it, render below the block.
  var primaryX = position.left + position.width / 2;
  var primaryY = position.bottom;
@@ -574,11 +574,11 @@ Blockly.DropDownDiv.hide = function() {
  Blockly.DropDownDiv.animateOutTimer_ =
  setTimeout(function() {
  Blockly.DropDownDiv.hideWithoutAnimation();
- if (Blockly.DropDownDiv.onHide_) {
- Blockly.DropDownDiv.onHide_();
- Blockly.DropDownDiv.onHide_ = null;
- }
  }, Blockly.DropDownDiv.ANIMATION_TIME * 1000);
+ if (Blockly.DropDownDiv.onHide_) {
+ Blockly.DropDownDiv.onHide_();
+ Blockly.DropDownDiv.onHide_ = null;
+ }
 };
 
 /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "blockly",
- "version": "3.20191014.0",
+ "version": "3.20191014.1",
  "description": "Blockly is a library for building visual programming editors.",
  "keywords": [
  "blockly"