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

Merge pull request #1614 from rachel-fenichel/bugfix/double_events

Browse Source 
Don't register mouse events if pointer events are supported
This commit is contained in:
Rachel Fenichel
2018-03-01 18:04:51 -08:00
committed by GitHub
parent 6565b2103b 8c8412af74
commit 7356c664a0
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/blockly.js
View File

@@ -53,6 +53,7 @@ goog.require('Blockly.WorkspaceSvg');
goog.require('Blockly.constants');
goog.require('Blockly.inject');
goog.require('Blockly.utils');
goog.require('goog.color');
goog.require('goog.userAgent');
@@ -450,10 +451,14 @@ Blockly.bindEventWithChecks_ = function(node, name, thisObject, func,
}
};
node.addEventListener(name, wrapFunc, false);
var bindData = [[node, name, wrapFunc]];
var bindData = [];
// Don't register the mouse event if an equivalent pointer event is supported.
if ((window && !window.PointerEvent) || !(name in Blockly.Touch.TOUCH_MAP)) {
node.addEventListener(name, wrapFunc, false);
bindData.push([node, name, wrapFunc]);
}
// Add equivalent touch event.
// Add equivalent touch or pointer event.
if (name in Blockly.Touch.TOUCH_MAP) {
var touchWrapFunc = function(e) {
wrapFunc(e);
@@ -495,10 +500,13 @@ Blockly.bindEvent_ = function(node, name, thisObject, func) {
}
};
node.addEventListener(name, wrapFunc, false);
var bindData = [[node, name, wrapFunc]];
// Add equivalent touch event.
var bindData = [];
// Don't register the mouse event if an equivalent pointer event is supported.
if ((window && !window.PointerEvent) || !(name in Blockly.Touch.TOUCH_MAP)) {
node.addEventListener(name, wrapFunc, false);
bindData.push([node, name, wrapFunc]);
}
// Add equivalent touch or pointer event.
if (name in Blockly.Touch.TOUCH_MAP) {
var touchWrapFunc = function(e) {
// Punt on multitouch events.

2
core/touch.js
View File

@@ -48,7 +48,7 @@ Blockly.Touch.touchIdentifier_ = null;
* @type {Object}
*/
Blockly.Touch.TOUCH_MAP = {};
if (window.PointerEvent) {
if (window && window.PointerEvent) {
Blockly.Touch.TOUCH_MAP = {
'mousedown': ['pointerdown'],
'mousemove': ['pointermove'],