From 8c8412af74025bd1a9d86e16bde264d9911afe20 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Fri, 16 Feb 2018 15:01:13 -0800 Subject: [PATCH] Just check whether the window exists, instead of using goog.events.BroswerFeature --- core/blockly.js | 7 ++----- core/touch.js | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/blockly.js b/core/blockly.js index d4a7a094b..3aa2cf908 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -55,7 +55,6 @@ goog.require('Blockly.inject'); goog.require('Blockly.utils'); goog.require('goog.color'); -goog.require('goog.events.BrowserFeature'); goog.require('goog.userAgent'); @@ -454,8 +453,7 @@ Blockly.bindEventWithChecks_ = function(node, name, thisObject, func, var bindData = []; // Don't register the mouse event if an equivalent pointer event is supported. - if (!goog.events.BrowserFeature.POINTER_EVENTS || - !(name in Blockly.Touch.TOUCH_MAP)) { + if ((window && !window.PointerEvent) || !(name in Blockly.Touch.TOUCH_MAP)) { node.addEventListener(name, wrapFunc, false); bindData.push([node, name, wrapFunc]); } @@ -504,8 +502,7 @@ Blockly.bindEvent_ = function(node, name, thisObject, func) { var bindData = []; // Don't register the mouse event if an equivalent pointer event is supported. - if (!goog.events.BrowserFeature.POINTER_EVENTS || - !(name in Blockly.Touch.TOUCH_MAP)) { + if ((window && !window.PointerEvent) || !(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 7a883c241..78e6f5e72 100644 --- a/core/touch.js +++ b/core/touch.js @@ -48,7 +48,7 @@ Blockly.Touch.touchIdentifier_ = null; * @type {Object} */ Blockly.Touch.TOUCH_MAP = {}; -if (goog.events.BrowserFeature.POINTER_EVENTS) { +if (window && window.PointerEvent) { Blockly.Touch.TOUCH_MAP = { 'mousedown': ['pointerdown'], 'mousemove': ['pointermove'],