From 5b66416b8c1d1e88272e8d63a8bf1ded9a25be59 Mon Sep 17 00:00:00 2001
From: AlessandroSigna <alesigna92@gmail.com>
Date: Fri, 13 Nov 2015 15:03:36 -0800
Subject: [PATCH] added cleanup before delete

---
 .../entityScripts/synchronizerEntityScript.js | 25 +++++++++++--------
 examples/entityScripts/synchronizerMaster.js  |  8 +++---
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/examples/entityScripts/synchronizerEntityScript.js b/examples/entityScripts/synchronizerEntityScript.js
index 733cb19eb3..82dd954381 100644
--- a/examples/entityScripts/synchronizerEntityScript.js
+++ b/examples/entityScripts/synchronizerEntityScript.js
@@ -24,16 +24,7 @@
     var isJoiningTheEvent = false;
     var _this;
     
-    function update(){
-        var userData = JSON.parse(Entities.getEntityProperties(_this.entityID, ["userData"]).userData);
-        var valueToCheck = userData.myKey.valueToCheck;
-        if(valueToCheck && !isJoiningTheEvent){
-            _this.sendMessage();
-        }else if((!valueToCheck && isJoiningTheEvent) || (isJoiningTheEvent && !insideArea)){
-            _this.stopMessage();
-        }
-        
-    }
+    
 
     function ParamsEntity() {
         _this = this;
@@ -42,10 +33,19 @@
     
     
     ParamsEntity.prototype = {
+        update: function(){
+            var userData = JSON.parse(Entities.getEntityProperties(_this.entityID, ["userData"]).userData);
+            var valueToCheck = userData.myKey.valueToCheck;
+            if(valueToCheck && !isJoiningTheEvent){
+                _this.sendMessage();
+            }else if((!valueToCheck && isJoiningTheEvent) || (isJoiningTheEvent && !insideArea)){
+                _this.stopMessage();
+            }
+        },
         preload: function(entityID) {
             print('entity loaded')
             this.entityID = entityID;
-            Script.update.connect(update);
+            Script.update.connect(_this.update);
         },
         enterEntity: function(entityID) {       
             print("enterEntity("+entityID+")");
@@ -75,6 +75,9 @@
                 print("The event ended");
                 isJoiningTheEvent = false;
             }
+        },
+        clean: function(entityID) {
+            Script.update.disconnect(_this.update);
         }
     }
     
diff --git a/examples/entityScripts/synchronizerMaster.js b/examples/entityScripts/synchronizerMaster.js
index fd4001ff3d..e5af46c461 100644
--- a/examples/entityScripts/synchronizerMaster.js
+++ b/examples/entityScripts/synchronizerMaster.js
@@ -10,7 +10,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-var PARAMS_SCRIPT_URL = 'https://raw.githubusercontent.com/AlessandroSigna/hifi/27fbef3e873d11648faf0a592bb2314a90c71624/examples/entityScripts/synchronizerEntityScript.js';
+var PARAMS_SCRIPT_URL = 'https://raw.githubusercontent.com/AlessandroSigna/hifi/05aa1d4ce49c719353007c245ae77ef2d2a8fc36/examples/entityScripts/synchronizerEntityScript.js';
 
 
 HIFI_PUBLIC_BUCKET = "http://s3.amazonaws.com/hifi-public/";
@@ -104,12 +104,10 @@ function mousePressEvent(event) {
     } 
 }
 
-Script.setTimeout(function() {
-    print('sending data to entity');
-    Entities.callEntityMethod(testEntity, 'testParams', data);
-}, 1500)
 
 function cleanup() {
+    toolBar.cleanup();
+    Entities.callEntityMethod(testEntity, 'clean');      //have to call this before deleting to avoid the JSON warnings
     Entities.deleteEntity(testEntity);
 }