Don't register mouse events if pointer events are supported #1614
Conversation
core/blockly.js
Outdated
| var bindData = [[node, name, wrapFunc]]; | ||
| var bindData = []; | ||
| // Don't register the mouse event if an equivalent pointer event is supported. | ||
| if (!window.PointerEvent || !(name in Blockly.Touch.TOUCH_MAP)) { |
There was a problem hiding this comment.
window might not exist in headless mode. Are we certain this function will never be called in headless? I feel more comfortable checking window too.
There was a problem hiding this comment.
Good point. That also means that there should be a check for window in touch.js:
Blockly.Touch.TOUCH_MAP = {};
if (window.PointerEvent) {
Blockly.Touch.TOUCH_MAP = {
'mousedown': ['pointerdown'],
'mousemove': ['pointermove'],
'mouseup': ['pointerup', 'pointercancel']
};
} else if (goog.events.BrowserFeature.TOUCH_ENABLED) {
Blockly.Touch.TOUCH_MAP = {
'mousedown': ['touchstart'],
'mousemove': ['touchmove'],
'mouseup': ['touchend', 'touchcancel']
};
}
In the particular case of bindEvent_, it's called from inject.js with window as the node argument, so we may have already failed.
It looks like we used to create a fake window object to solve this problem (not the best solution): https://github.com/google/blockly/pull/1566/files Now that's gone.
core/blockly.js
Outdated
| // Add equivalent touch event. | ||
| var bindData = []; | ||
| // Don't register the mouse event if an equivalent pointer event is supported. | ||
| if (!window.PointerEvent || !(name in Blockly.Touch.TOUCH_MAP)) { |
|
This still doesn't work--now I get zero clicks in firefox and one click in chrome, instead of one click in firefox and two in chrome. I'm disabling them for this release. |
|
Merged, because @samelhusseini proved that the problem was with the firefox simulator. |
See microsoft/pxt-blockly#96
@MicrosoftSam