A bunch of small bug fixes (#3067)

This commit is contained in:
alschmiedt
2019-09-23 08:59:50 -07:00
committed by GitHub
parent b0e700307a
commit c16ea62b58
5 changed files with 28 additions and 22 deletions

View File

@@ -368,18 +368,20 @@ Blockly.FieldColour.prototype.onKeyDown_ = function(e) {
* @package
*/
Blockly.FieldColour.prototype.onBlocklyAction = function(action) {
if (action === Blockly.navigation.ACTION_PREVIOUS) {
this.moveHighlightBy_(0, -1);
return true;
} else if (action === Blockly.navigation.ACTION_NEXT) {
this.moveHighlightBy_(0, 1);
return true;
} else if (action === Blockly.navigation.ACTION_OUT) {
this.moveHighlightBy_(-1, 0);
return true;
} else if (action === Blockly.navigation.ACTION_IN) {
this.moveHighlightBy_(1, 0);
return true;
if (this.picker_) {
if (action === Blockly.navigation.ACTION_PREVIOUS) {
this.moveHighlightBy_(0, -1);
return true;
} else if (action === Blockly.navigation.ACTION_NEXT) {
this.moveHighlightBy_(0, 1);
return true;
} else if (action === Blockly.navigation.ACTION_OUT) {
this.moveHighlightBy_(-1, 0);
return true;
} else if (action === Blockly.navigation.ACTION_IN) {
this.moveHighlightBy_(1, 0);
return true;
}
}
return Blockly.FieldColour.superClass_.onBlocklyAction.call(this, action);
};
@@ -583,6 +585,7 @@ Blockly.FieldColour.prototype.dropdownDispose_ = function() {
Blockly.unbindEvent_(this.onMouseEnterWrapper_);
Blockly.unbindEvent_(this.onMouseLeaveWrapper_);
Blockly.unbindEvent_(this.onKeyDownWrapper_);
this.picker_ = null;
};
Blockly.fieldRegistry.register('field_colour', Blockly.FieldColour);