Merge pull request #3 from MathuraMG/remove-objects

clear objects array
MathuraMG · Feb 16, 2017 · a1c1267 · a1c1267
2 parents cf08d7f + 220e896
commit a1c1267
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/entities/_baseEntity.js b/entities/_baseEntity.js
@@ -18,16 +18,17 @@ function BaseEntity(Interceptor,object,arguments, canvasX, canvasY) {
     var xCoord, yCoord;
     arguments = [].slice.call(arguments);
     var i = 0;
+    var that = this;
+    that.coordinates = '';
 
     arguments.forEach(function(argument){
       a = argument;
-
       if (object.params[i].description.indexOf('x-coordinate') > -1) {
         xCoord = a;
-        this.coordinates += a + 'x,';
+        that.coordinates += a + 'x,';
       } else if (object.params[i].description.indexOf('y-coordinate') > -1) {
         yCoord = a;
-        this.coordinates += a + 'y';
+        that.coordinates += a + 'y';
       }
       i++;
     });

diff --git a/entities/entity.min.js b/entities/entity.min.js
diff --git a/gridInterceptor/interceptorFunctions.js b/gridInterceptor/interceptorFunctions.js
@@ -11,6 +11,7 @@ gridInterceptor.prototype = Object.create(baseInterceptor.prototype);
 
 gridInterceptor.prototype.clearVariables = function(object) {
   object.objectTypeCount = {};
+  object.objectArray = [];
   object.objectCount = 0;
   this.isCleared = true;
   return object;

diff --git a/textInterceptor/interceptorFunctions.js b/textInterceptor/interceptorFunctions.js
@@ -6,6 +6,7 @@ textInterceptor.prototype = Object.create(baseInterceptor.prototype);
 
 textInterceptor.prototype.clearVariables = function(object) {
   object.objectTypeCount = {};
+  object.objectArray = [];
   object.objectCount = 0;
   this.isCleared = true;
   return object;
@@ -166,7 +167,7 @@ textInterceptor.prototype.getSummary = function(object1, object2, element) {
     var objectList = document.createElement('ul');
 
     if (this.totalCount < 100) {
-    
+
       object1.objectArray.forEach(function(objArrayItem,i){
         var objectListItem = document.createElement('li');
         objectList.appendChild(objectListItem);
@@ -177,7 +178,7 @@ textInterceptor.prototype.getSummary = function(object1, object2, element) {
         objectListItem.innerHTML += '; area = ' + objArrayItem['area'] +
           '; location = ' + objArrayItem['location'];
       });
-    
+
       object2.objectArray.forEach(function(objArrayItem,i){
         var objectListItem = document.createElement('li');
         objectList.appendChild(objectListItem);