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

Fixing variable dropdowns so they select the correct option. (#1184)

Browse Source
This commit is contained in:
CoryDCode
2017-06-21 19:05:36 -07:00
committed by GitHub
parent 912712cbf5
commit d4bf02a451
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
accessible/field-segment.component.js
View File

@@ -58,11 +58,10 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
<template [ngIf]="isDropdown()">
{{getPrefixText()}}
<select [id]="mainFieldId" [name]="mainFieldId"
[ngModel]="mainField.getValue()" (ngModelChange)="setDropdownValue($event)"
[ngModel]="selectedOption" (ngModelChange)="setDropdownValue($event)"
(keydown.enter)="selectOption()"
tabindex="-1">
<option *ngFor="#option of dropdownOptions" value="{{option.value}}"
[attr.select]="optionValue === option.value ? true : null">
<option *ngFor="#option of dropdownOptions" value="{{option.value}}">
{{option.text}}
</option>
</select>
@@ -92,6 +91,7 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
ngDoCheck: function() {
if (this.isDropdown() && this.shouldBreakCache()) {
this.optionValue = this.mainField.getValue();
this.fieldValue = this.mainField.getValue();
this.rawOptions = this.mainField.getOptions();
this.dropdownOptions = this.rawOptions.map(function(valueAndText) {
return {
@@ -99,6 +99,13 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
value: valueAndText[1]
};
});
// Set the currently selected value to the variable on the field.
for (var i = 0; i < this.dropdownOptions.length; i++) {
if (this.dropdownOptions[i].text === this.fieldValue) {
this.selectedOption = this.dropdownOptions[i].value;
}
}
}
},
// Returns whether the mutable, cached information needs to be refreshed.
@@ -110,11 +117,15 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
for (var i = 0; i < this.rawOptions.length; i++) {
// Compare the value of the cached options with the values in the field.
if (newOptions[i][1] != this.rawOptions[i][1]) {
if (newOptions[i][0] != this.rawOptions[i][0]) {
return true;
}
}
if (this.fieldValue != this.mainField.getValue()) {
return true;
}
return false;
},
// Gets the prefix text, to be printed before a field.

4
accessible/variable-add-modal.component.js
View File

@@ -52,10 +52,10 @@ blocklyApp.VariableAddModalComponent = ng.core.Component({
aria-labelledby="inputLabel" />
</p>
<hr>
<button id="submitButton" (click)="submit()">
<button type="button" id="submitButton" (click)="submit()">
SUBMIT
</button>
<button id="cancelButton" (click)="dismissModal()">
<button type="button" id="cancelButton" (click)="dismissModal()">
CANCEL
</button>
</form>

4
accessible/variable-remove-modal.component.js
View File

@@ -50,10 +50,10 @@ blocklyApp.VariableRemoveModalComponent = ng.core.Component({
<form id="varForm">
<hr>
<button id="yesButton" (click)="submit()">
<button type="button" id="yesButton" (click)="submit()">
YES
</button>
<button id="noButton" (click)="dismissModal()">
<button type="button" id="noButton" (click)="dismissModal()">
NO
</button>
</form>

4
accessible/variable-rename-modal.component.js
View File

@@ -53,10 +53,10 @@ blocklyApp.VariableRenameModalComponent = ng.core.Component({
aria-labelledby="inputLabel" />
</p>
<hr>
<button id="submitButton" (click)="submit()">
<button type="button" id="submitButton" (click)="submit()">
SUBMIT
</button>
<button id="cancelButton" (click)="dismissModal()">
<button type="button" id="cancelButton" (click)="dismissModal()">
CANCEL
</button>
</form>