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

Merge pull request #1904 from rachel-fenichel/bugfix/1804

Browse Source 
Remove custom touch handling code for dropdown fields
This commit is contained in:
Rachel Fenichel
2018-06-06 15:30:35 -07:00
committed by GitHub
parent dc081e3677 bae346963f
commit 2f67cc235e
1 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/field_dropdown.js
View File

@@ -144,19 +144,8 @@ Blockly.FieldDropdown.prototype.init = function() {
Blockly.FieldDropdown.prototype.showEditor_ = function() {
Blockly.WidgetDiv.show(this, this.sourceBlock_.RTL, null);
var menu = this.createMenu_();
this.addEventListeners_(menu);
this.positionMenu_(menu);
};
/**
* Add event listeners for actions on the items in the dropdown menu.
* @param {!goog.ui.Menu} menu The menu to add listeners to.
* @private
*/
Blockly.FieldDropdown.prototype.addEventListeners_ = function(menu) {
this.addActionListener_(menu);
this.addTouchStartListener_(menu);
this.addTouchEndListener_(menu);
this.positionMenu_(menu);
};
/**
@@ -180,38 +169,6 @@ Blockly.FieldDropdown.prototype.addActionListener_ = function(menu) {
goog.events.listen(menu, goog.ui.Component.EventType.ACTION, callback);
};
/**
* Add a listener for touch start events on menu items.
* @param {!goog.ui.Menu} menu The menu to add the listener to.
* @private
*/
Blockly.FieldDropdown.prototype.addTouchStartListener_ = function(menu) {
// Listen for touch events (why doesn't Closure handle this already?).
function callback(e) {
var control = this.getOwnerControl(/** @type {Node} */ (e.target));
// Highlight the menu item.
control.handleMouseDown(e);
}
menu.getHandler().listen(
menu.getElement(), goog.events.EventType.TOUCHSTART, callback);
};
/**
* Add a listener for touch end events on menu items.
* @param {!goog.ui.Menu} menu The menu to add the listener to.
* @private
*/
Blockly.FieldDropdown.prototype.addTouchEndListener_ = function(menu) {
// Listen for touch events (why doesn't Closure handle this already?).
function callbackTouchEnd(e) {
var control = this.getOwnerControl(/** @type {Node} */ (e.target));
// Activate the menu item.
control.performActionInternal(e);
}
menu.getHandler().listen(
menu.getElement(), goog.events.EventType.TOUCHEND, callbackTouchEnd);
};
/**
* Create and populate the menu and menu items for this dropdown, based on
* the options list.