Fix Audio test in IE (issue 272) and fix error when deleting block wi…

…th warning.
scratchfoundation · Aug 20, 2015 · 96d5987 · 96d5987
1 parent f3ea66a
commit 96d5987
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/blockly_compressed.js b/blockly_compressed.js
diff --git a/core/block_svg.js b/core/block_svg.js
@@ -1252,8 +1252,10 @@ Blockly.BlockSvg.prototype.setWarningText = function(text, opt_id) {
     // Wait until the drag finishes.
     var thisBlock = this;
     this.setWarningText.pid_[id] = setTimeout(function() {
-      delete thisBlock.setWarningText.pid_[id];
-      thisBlock.setWarningText(text, id);
+      if (thisBlock.workspace) {  // Check block wasn't deleted.
+        delete thisBlock.setWarningText.pid_[id];
+        thisBlock.setWarningText(text, id);
+      }
     }, 100);
     return;
   }

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
@@ -702,12 +702,17 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
  * @private
  */
 Blockly.WorkspaceSvg.prototype.loadAudio_ = function(filenames, name) {
-  if (!window['Audio'] || !filenames.length) {
+  if (!filenames.length) {
+    return;
+  }
+  try {
+    var audioTest = new window['Audio']();
+  } catch(e) {
     // No browser support for Audio.
+    // IE can throw an error even if the Audio object exists.
     return;
   }
   var sound;
-  var audioTest = new window['Audio']();
   for (var i = 0; i < filenames.length; i++) {
     var filename = filenames[i];
     var ext = filename.match(/\.(\w+)$/);