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

Switch to goog.events.BrowserFeature.POINTER_EVENTS

Browse Source
This commit is contained in:
Rachel Fenichel
2018-02-15 11:26:06 -08:00
parent 2a00055e57
commit e5a2ef30f2
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/blockly.js
View File

@@ -53,7 +53,9 @@ goog.require('Blockly.WorkspaceSvg');
goog.require('Blockly.constants');
goog.require('Blockly.inject');
goog.require('Blockly.utils');
goog.require('goog.color');
goog.require('goog.events.BrowserFeature');
goog.require('goog.userAgent');
@@ -452,7 +454,8 @@ Blockly.bindEventWithChecks_ = function(node, name, thisObject, func,
var bindData = [];
// Don't register the mouse event if an equivalent pointer event is supported.
if (!window.PointerEvent || !(name in Blockly.Touch.TOUCH_MAP)) {
if (!goog.events.BrowserFeature.POINTER_EVENTS ||
!(name in Blockly.Touch.TOUCH_MAP)) {
node.addEventListener(name, wrapFunc, false);
bindData.push([node, name, wrapFunc]);
}
@@ -501,7 +504,8 @@ Blockly.bindEvent_ = function(node, name, thisObject, func) {
var bindData = [];
// Don't register the mouse event if an equivalent pointer event is supported.
if (!window.PointerEvent || !(name in Blockly.Touch.TOUCH_MAP)) {
if (!goog.events.BrowserFeature.POINTER_EVENTS ||
!(name in Blockly.Touch.TOUCH_MAP)) {
node.addEventListener(name, wrapFunc, false);
bindData.push([node, name, wrapFunc]);
}

2
core/touch.js
View File

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