From 32631577a46deedc2698e627e8a7ee9572d03ba5 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Wed, 15 May 2019 16:47:35 -0700
Subject: [PATCH] Defenestration

---
 core/block_svg.js       |  2 +-
 core/blockly.js         | 13 +++++++------
 core/dropdowndiv.js     |  4 +++-
 core/touch.js           |  2 +-
 core/workspace_audio.js |  4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/block_svg.js b/core/block_svg.js
index 47cee2673..505da905a 100644
--- a/core/block_svg.js
+++ b/core/block_svg.js
@@ -629,7 +629,7 @@ Blockly.BlockSvg.prototype.onMouseDown_ = function(e) {
 Blockly.BlockSvg.prototype.showHelp_ = function() {
   var url = (typeof this.helpUrl == 'function') ? this.helpUrl() : this.helpUrl;
   if (url) {
-    window.open(url);
+    open(url);
   }
 };
 
diff --git a/core/blockly.js b/core/blockly.js
index 2cbbe956d..d9c6764d9 100644
--- a/core/blockly.js
+++ b/core/blockly.js
@@ -383,7 +383,7 @@ Blockly.getMainWorkspace = function() {
  * @param {function()=} opt_callback The callback when the alert is dismissed.
  */
 Blockly.alert = function(message, opt_callback) {
-  window.alert(message);
+  alert(message);
   if (opt_callback) {
     opt_callback();
   }
@@ -396,7 +396,7 @@ Blockly.alert = function(message, opt_callback) {
  * @param {!function(boolean)} callback The callback for handling user response.
  */
 Blockly.confirm = function(message, callback) {
-  callback(window.confirm(message));
+  callback(confirm(message));
 };
 
 /**
@@ -409,7 +409,7 @@ Blockly.confirm = function(message, callback) {
  * @param {!function(string)} callback The callback for handling user response.
  */
 Blockly.prompt = function(message, defaultValue, callback) {
-  callback(window.prompt(message, defaultValue));
+  callback(prompt(message, defaultValue));
 };
 
 /**
@@ -498,7 +498,8 @@ Blockly.bindEventWithChecks_ = function(node, name, thisObject, func,
   };
 
   var bindData = [];
-  if (Blockly.utils.global.PointerEvent && (name in Blockly.Touch.TOUCH_MAP)) {
+  if (Blockly.utils.global['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]);
@@ -550,8 +551,8 @@ Blockly.bindEvent_ = function(node, name, thisObject, func) {
   };
 
   var bindData = [];
-  var window = Blockly.utils.global['window'];
-  if (window && window.PointerEvent && (name in Blockly.Touch.TOUCH_MAP)) {
+  if (Blockly.utils.global['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/dropdowndiv.js b/core/dropdowndiv.js
index cdcb14388..5af33b8c9 100644
--- a/core/dropdowndiv.js
+++ b/core/dropdowndiv.js
@@ -456,7 +456,9 @@ Blockly.DropDownDiv.hideWithoutAnimation = function() {
   if (!Blockly.DropDownDiv.isVisible()) {
     return;
   }
-  Blockly.DropDownDiv.animateOutTimer_ && window.clearTimeout(Blockly.DropDownDiv.animateOutTimer_);
+  if (Blockly.DropDownDiv.animateOutTimer_) {
+    clearTimeout(Blockly.DropDownDiv.animateOutTimer_);
+  }
   Blockly.DropDownDiv.positionInternal_();
   Blockly.DropDownDiv.clearContent();
   Blockly.DropDownDiv.owner_ = null;
diff --git a/core/touch.js b/core/touch.js
index 69f35a4d0..9ca395b30 100644
--- a/core/touch.js
+++ b/core/touch.js
@@ -48,7 +48,7 @@ Blockly.Touch.touchIdentifier_ = null;
  * @type {Object}
  */
 Blockly.Touch.TOUCH_MAP = {};
-if (Blockly.utils.global.PointerEvent) {
+if (Blockly.utils.global['PointerEvent']) {
   Blockly.Touch.TOUCH_MAP = {
     'mousedown': ['pointerdown'],
     'mouseenter': ['pointerenter'],
diff --git a/core/workspace_audio.js b/core/workspace_audio.js
index 9e0402551..75e02d04c 100644
--- a/core/workspace_audio.js
+++ b/core/workspace_audio.js
@@ -82,7 +82,7 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
     return;
   }
   try {
-    var audioTest = new window['Audio']();
+    var audioTest = new Blockly.utils.global['Audio']();
   } catch (e) {
     // No browser support for Audio.
     // IE can throw an error even if the Audio object exists.
@@ -94,7 +94,7 @@ Blockly.WorkspaceAudio.prototype.load = function(filenames, name) {
     var ext = filename.match(/\.(\w+)$/);
     if (ext && audioTest.canPlayType('audio/' + ext[1])) {
       // Found an audio format we can play.
-      sound = new window['Audio'](filename);
+      sound = new Blockly.utils.global['Audio'](filename);
       break;
     }
   }