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

Use selected option instead of selected index to cache current selected value in field. (#3602)

Browse Source
This commit is contained in:
Sam El-Husseini
2020-01-16 13:33:45 -08:00
committed by GitHub
parent 6c6296d74a
commit f8000e00dc
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/field_dropdown.js
View File

@@ -78,20 +78,19 @@ Blockly.FieldDropdown = function(menuGenerator, opt_validator, opt_config) {
*/
this.generatedOptions_ = null;
this.trimOptions_();
/**
* The currently selected index. The field is initialized with the
* The currently selected option. The field is initialized with the
* first option selected.
* @type {number}
* @type {!Object}
* @private
*/
this.selectedIndex_ = 0;
this.trimOptions_();
var firstTuple = this.getOptions(false)[0];
this.selectedOption_ = this.getOptions(false)[0];
// Call parent's constructor.
Blockly.FieldDropdown.superClass_.constructor.call(
this, firstTuple[1], opt_validator, opt_config);
this, this.selectedOption_[1], opt_validator, opt_config);
/**
* A reference to the currently selected menu item.
@@ -527,7 +526,7 @@ Blockly.FieldDropdown.prototype.doValueUpdate_ = function(newValue) {
var options = this.getOptions(true);
for (var i = 0, option; (option = options[i]); i++) {
if (option[1] == this.value_) {
this.selectedIndex_ = i;
this.selectedOption_ = option;
}
}
};
@@ -567,12 +566,10 @@ Blockly.FieldDropdown.prototype.render_ = function() {
this.imageElement_.style.display = 'none';
// Show correct element.
var options = this.getOptions(true);
var selectedOption = this.selectedIndex_ >= 0 &&
options[this.selectedIndex_][0];
if (selectedOption && typeof selectedOption == 'object') {
var option = this.selectedOption_ && this.selectedOption_[0];
if (option && typeof option == 'object') {
this.renderSelectedImage_(
/** @type {!Blockly.FieldDropdown.ImageProperties} */ (selectedOption));
/** @type {!Blockly.FieldDropdown.ImageProperties} */ (option));
} else {
this.renderSelectedText_();
}
@@ -700,15 +697,14 @@ Blockly.FieldDropdown.prototype.positionSVGArrow_ = function(x, y) {
* @override
*/
Blockly.FieldDropdown.prototype.getText_ = function() {
if (this.selectedIndex_ < 0) {
if (!this.selectedOption_) {
return null;
}
var options = this.getOptions(true);
var selectedOption = options[this.selectedIndex_][0];
if (typeof selectedOption == 'object') {
return selectedOption['alt'];
var option = this.selectedOption_[0];
if (typeof option == 'object') {
return option['alt'];
}
return selectedOption;
return option;
};
/**