From 1687275cb23abadb461e3c0754bf6472d7dea728 Mon Sep 17 00:00:00 2001
From: Andrew n marshall <Anm@anm.me>
Date: Tue, 1 May 2018 13:35:51 -0700
Subject: [PATCH] Replace raw window references with goog.global.window.
 (#1818)

This should be safer when run within Node.
---
 core/blockly.js | 6 ++++--
 core/touch.js   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/blockly.js b/core/blockly.js
index 9f2840629..71e50aaa3 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -464,7 +464,8 @@ Blockly.bindEventWithChecks_ = function(node, name, thisObject, func,
   };
 
   var bindData = [];
-  if (window && window.PointerEvent && (name in Blockly.Touch.TOUCH_MAP)) {
+  if (goog.global.window && goog.global.window.PointerEvent &&
+      (name in Blockly.Touch.TOUCH_MAP)) {
     for (var i = 0, type; type = Blockly.Touch.TOUCH_MAP[name][i]; i++) {
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
@@ -516,7 +517,8 @@ Blockly.bindEvent_ = function(node, name, thisObject, func) {
   };
 
   var bindData = [];
-  if (window && window.PointerEvent && (name in Blockly.Touch.TOUCH_MAP)) {
+  if (goog.global.window && goog.global.window.PointerEvent &&
+      (name in Blockly.Touch.TOUCH_MAP)) {
     for (var i = 0, type; type = Blockly.Touch.TOUCH_MAP[name][i]; i++) {
       node.addEventListener(type, wrapFunc, false);
       bindData.push([node, type, wrapFunc]);
diff --git a/core/touch.js b/core/touch.js
index 24a741d43..4a3a6d353 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 && window.PointerEvent) {
+if (goog.global.window && goog.global.window.PointerEvent) {
   Blockly.Touch.TOUCH_MAP = {
     'mousedown': ['pointerdown'],
     'mouseenter': ['pointerenter'],