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.

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

Auto-quote dropdown options for string inputs #24825

Merged
merged 1 commit into from Sep 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion apps/src/block_utils.js
Expand Up @@ -613,7 +613,12 @@ const STANDARD_INPUT_TYPES = {
.appendTitle(dropdown, inputConfig.name);
},
generateCode(block, inputConfig) {
return block.getTitleValue(inputConfig.name);
let code = block.getTitleValue(inputConfig.name);
if (inputConfig.type === Blockly.BlockValueType.STRING && !code.startsWith('"') && !code.startsWith("'")) {
// Wraps the value in quotes, and escapes quotes/newlines
code = JSON.stringify(code);
}
return code;
},
},
[FIELD_INPUT]: {
Expand Down
2 changes: 0 additions & 2 deletions dashboard/config/blocks/craft/craft_turn.js
@@ -1,5 +1,3 @@
var right = 'right', left = 'left';

function turn(dir) {
if (dir === 'right') {
turnRight();
Expand Down
1 change: 1 addition & 0 deletions dashboard/config/blocks/craft/craft_turn.json
Expand Up @@ -6,6 +6,7 @@
"args": [
{
"name": "DIR",
"type": "String",
"options": [
[
"right ↻",
Expand Down