From e5a2ef30f2bf06833b3b336a3a1919aa54ba49d5 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Thu, 15 Feb 2018 11:26:06 -0800 Subject: [PATCH] Switch to goog.events.BrowserFeature.POINTER_EVENTS --- core/blockly.js | 8 ++++++-- core/touch.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/blockly.js b/core/blockly.js index 892ee152e..d4a7a094b 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -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]); } diff --git a/core/touch.js b/core/touch.js index 8aad46b08..7a883c241 100644 --- a/core/touch.js +++ b/core/touch.js @@ -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'],