CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-07 09:00:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix types and review comments

Browse Source
This commit is contained in:
Rachel Fenichel
2019-11-12 11:50:34 -08:00
parent 5f4a308a40
commit 9d6f4c8177
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/field_textinput.js
View File

@@ -88,7 +88,7 @@ Blockly.FieldTextInput = function(opt_value, opt_validator, opt_config) {
/**
* Whether the field should consider the whole parent block to be its click
* target.
* @type {boolean}
* @type {?boolean}
*/
this.fullBlockClickTarget_ = false;
};
@@ -136,8 +136,7 @@ Blockly.FieldTextInput.prototype.configure_ = function(config) {
};
/**
* Create the block UI for this field.
* @package
* @override
*/
Blockly.FieldTextInput.prototype.initView = function() {
var renderer = this.sourceBlock_.workspace.getRenderer();
@@ -342,6 +341,16 @@ Blockly.FieldTextInput.prototype.widgetCreate_ = function() {
htmlInput.style.fontSize = fontSize;
var borderRadius =
(Blockly.FieldTextInput.BORDERRADIUS * this.workspace_.scale) + 'px';
if (this.fullBlockClickTarget_) {
var bBox = this.getScaledBBox();
// Override border radius.
borderRadius = (bBox.bottom - bBox.top) / 2;
// Pull stroke colour from the existing shadow block
var strokeColour = this.sourceBlock_.style.colourTertiary;
div.style.borderColor = strokeColour;
}
htmlInput.style.borderRadius = borderRadius;
div.appendChild(htmlInput);
@@ -349,14 +358,6 @@ Blockly.FieldTextInput.prototype.widgetCreate_ = function() {
htmlInput.untypedDefaultValue_ = this.value_;
htmlInput.oldValue_ = null;
if (this.fullBlockClickTarget_) {
var bBox = this.getScaledBBox();
var borderRadius = (bBox.bottom - bBox.top) / 2;
htmlInput.style.borderRadius = borderRadius + 'px';
// Pull stroke colour from the existing shadow block
var strokeColour = this.sourceBlock_.style.colourTertiary;
div.style.borderColor = strokeColour;
}
if (Blockly.utils.userAgent.GECKO) {
// In FF, ensure the browser reflows before resizing to avoid issue #2777.