Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core/field_dropdown : always return something. #14

Closed
wants to merge 10 commits into from
+9 −4
Closed

core/field_dropdown : always return something. #14

Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
89dc650
Allow variables to go anywhere
LilyMakesThings Aug 6, 2023
31ac839
Merge branch 'TurboWarp:develop' into develop
LilyMakesThings Dec 31, 2023
6b277d4
Merge branch 'TurboWarp:develop' into develop
LilyMakesThings Jan 11, 2024
23dbffd
this upsets me more than it should
LilyMakesThings Jan 16, 2024
2cea430
Merge branch 'TurboWarp:develop' into develop
LilyMakesThings Jan 16, 2024
d11a554
Merge branch 'TurboWarp:develop' into develop
LilyMakesThings Feb 1, 2024
77eca6f
Update field_dropdown.js
LilyMakesThings Feb 9, 2024
c2b4602
Update field_dropdown.js
LilyMakesThings Feb 9, 2024
e72d810
Update data.js
LilyMakesThings Feb 9, 2024
9d95086
Compare arrays properly
LilyMakesThings Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions core/field_dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ Blockly.FieldDropdown.prototype.init = function() {
*/
Blockly.FieldDropdown.prototype.showEditor_ = function() {
var options = this.getOptions();
if (options.length == 0) return;
if (options.length == 0 || options == ['']) return;
LilyMakesThings marked this conversation as resolved.
Show resolved Hide resolved

this.dropDownOpen_ = true;
// If there is an existing drop-down someone else owns, hide it immediately and clear it.
Expand Down Expand Up @@ -331,10 +331,15 @@ Blockly.FieldDropdown.prototype.isOptionListDynamic = function() {
* (human-readable text or image, language-neutral name).
*/
Blockly.FieldDropdown.prototype.getOptions = function() {
var options = [];

if (goog.isFunction(this.menuGenerator_)) {
return this.menuGenerator_.call(this);
}
return /** @type {!Array.<!Array.<string>>} */ (this.menuGenerator_);
options = this.menuGenerator_.call(this);
} else options = (this.menuGenerator_);

/** @type {!Array.<!Array.<string>>} */
if (options.length > 0) return options;
return [''];
};

/**
Expand Down