From 3e7cc7d6eb86e8bd56c97fbe655c59f5d8acf99b Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 16 Sep 2015 17:02:52 -0700
Subject: [PATCH] remove sounds from bubble

---
 examples/toys/bubblewand/bubble.js | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/examples/toys/bubblewand/bubble.js b/examples/toys/bubblewand/bubble.js
index 91a72642d3..29d087176b 100644
--- a/examples/toys/bubblewand/bubble.js
+++ b/examples/toys/bubblewand/bubble.js
@@ -12,7 +12,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-(function() { << << << < HEAD
+(function() {
     Script.include("../../utilities.js");
     Script.include("../../libraries/utils.js");
 
@@ -32,7 +32,7 @@
     this.preload = function(entityID) {
         //  print('bubble preload')
         _this.entityID = entityID;
-        Script.update.connect(_t.internalUpdate);
+        Script.update.connect(_this.internalUpdate);
     };
 
     this.internalUpdate = function() {
@@ -47,24 +47,11 @@
     this.unload = function(entityID) {
         Script.update.disconnect(this.internalUpdate);
         var position = properties.position;
-        _t.endOfBubble(position);
-        //  print('UNLOAD PROPS' + JSON.stringify(position));
-
+        _this.endOfBubble(position);
     };
 
     this.endOfBubble = function(position) {
-
         this.createBurstParticles(position);
-        this.burstBubbleSound(position);
-    }
-
-    this.burstBubbleSound = function(position) {
-        var audioOptions = {
-            volume: 0.5,
-            position: position
-        }
-        Audio.playSound(POP_SOUNDS[randInt(0, 4)], audioOptions);
-
     }
 
     this.createBurstParticles = function(position) {