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

Set the text not the value when closing a text editor.

Browse Source 
Also rename variables for clarity.
This commit is contained in:
Neil Fraser
2016-11-24 10:39:13 -08:00
parent 065e801a08
commit ac0105cb4d
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/field.js
View File

@@ -408,19 +408,19 @@ Blockly.Field.prototype.getText = function() {
/**
* Set the text in this field. Trigger a rerender of the source block.
* @param {*} text New text.
* @param {*} newText New text.
*/
Blockly.Field.prototype.setText = function(text) {
if (text === null) {
Blockly.Field.prototype.setText = function(newText) {
if (newText === null) {
// No change if null.
return;
}
text = String(text);
if (text === this.text_) {
newText = String(newText);
if (newText === this.text_) {
// No change.
return;
}
this.text_ = text;
this.text_ = newText;
// Set width to 0 to force a rerender of this field.
this.size_.width = 0;
@@ -433,7 +433,7 @@ Blockly.Field.prototype.setText = function(text) {
/**
* By default there is no difference between the human-readable text and
* the language-neutral values. Subclasses (such as dropdown) may define this.
* @return {string} Current text.
* @return {string} Current value.
*/
Blockly.Field.prototype.getValue = function() {
return this.getText();
@@ -442,22 +442,22 @@ Blockly.Field.prototype.getValue = function() {
/**
* By default there is no difference between the human-readable text and
* the language-neutral values. Subclasses (such as dropdown) may define this.
* @param {string} newText New text.
* @param {string} newValue New value.
*/
Blockly.Field.prototype.setValue = function(newText) {
if (newText === null) {
Blockly.Field.prototype.setValue = function(newValue) {
if (newValue === null) {
// No change if null.
return;
}
var oldText = this.getValue();
if (oldText == newText) {
var oldValue = this.getValue();
if (oldValue == newValue) {
return;
}
if (this.sourceBlock_ && Blockly.Events.isEnabled()) {
Blockly.Events.fire(new Blockly.Events.Change(
this.sourceBlock_, 'field', this.name, oldText, newText));
this.sourceBlock_, 'field', this.name, oldValue, newValue));
}
this.setText(newText);
this.setText(newValue);
};
/**

18
core/field_textinput.js
View File

@@ -75,23 +75,23 @@ Blockly.FieldTextInput.prototype.dispose = function() {
};
/**
* Set the text in this field.
* @param {?string} text New text.
* Set the value of this field.
* @param {?string} newValue New value.
* @override
*/
Blockly.FieldTextInput.prototype.setValue = function(text) {
if (text === null) {
Blockly.FieldTextInput.prototype.setValue = function(newValue) {
if (newValue === null) {
return; // No change if null.
}
if (this.sourceBlock_) {
var validated = this.callValidator(text);
// If the new text is invalid, validation returns null.
var validated = this.callValidator(newValue);
// If the new value is invalid, validation returns null.
// In this case we still want to display the illegal result.
if (validated !== null) {
text = validated;
newValue = validated;
}
}
Blockly.Field.prototype.setValue.call(this, text);
Blockly.Field.prototype.setValue.call(this, newValue);
};
/**
@@ -282,7 +282,7 @@ Blockly.FieldTextInput.prototype.widgetDispose_ = function() {
}
}
}
thisField.setValue(text);
thisField.setText(text);
thisField.sourceBlock_.rendered && thisField.sourceBlock_.render();
Blockly.unbindEvent_(htmlInput.onKeyDownWrapper_);
Blockly.unbindEvent_(htmlInput.onKeyUpWrapper_);