From 21bc8d7e6bc2b5df433f98647b172e70a3eb2aec Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 24 Apr 2019 20:38:00 +0200
Subject: [PATCH] EventHandling Improved

---
 SimulationExecution.js | 19 +++++++++++++++----
 TradingSimulation.js   | 26 ++++++++++++++++----------
 2 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/SimulationExecution.js b/SimulationExecution.js
index cc06fb980..8b820610d 100644
--- a/SimulationExecution.js
+++ b/SimulationExecution.js
@@ -54,6 +54,10 @@
     let previousNotesSetKey;
     let currentNotesSetKey;
 
+    let offsetChangedEventSubscriptionId
+    let filesUpdatedEventSubscriptionId
+    let dimmensionsChangedEventSubscriptionId
+
     return thisObject;
 
     function finalize() {
@@ -63,8 +67,9 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged);
-            fileSequence.eventHandler.stopListening("Files Updated", onFilesUpdated);
+            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            fileSequence.eventHandler.stopListening(filesUpdatedEventSubscriptionId);
+            thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
 
             /* Destroyd References */
 
@@ -96,9 +101,15 @@
             recalculate(callBackFunction);
             recalculateScale(callBackFunction);
 
-            fileSequence.eventHandler.listenToEvent("Files Updated", onFilesUpdated); // Only the first sequence is supported right now.
-            viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged);
+            filesUpdatedEventSubscriptionId = fileSequence.eventHandler.listenToEvent("Files Updated", onFilesUpdated); // Only the first sequence is supported right now.
+            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged);
 
+            /* Ready for when dimmension changes. */
+
+            dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () {
+                recalculate(callBackFunction);
+                recalculateScale(callBackFunction);
+            })
             callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE);
 
         } catch (err) {
diff --git a/TradingSimulation.js b/TradingSimulation.js
index c612d8c00..8b307f952 100644
--- a/TradingSimulation.js
+++ b/TradingSimulation.js
@@ -60,6 +60,12 @@
     let imageStopLossPhase;
     let imageBuyOrderPhase;
 
+    let zoomChangedEventSubscriptionId
+    let offsetChangedEventSubscriptionId
+    let filesUpdatedEventSubscriptionId
+    let dragFinishedEventSubscriptionId
+    let dimmensionsChangedEventSubscriptionId
+
     return thisObject;
 
     function finalize() {
@@ -69,11 +75,11 @@
 
             /* Stop listening to the necesary events. */
 
-            viewPort.eventHandler.stopListening("Zoom Changed", onZoomChanged);
-            viewPort.eventHandler.stopListening("Offset Changed", onOffsetChanged);
-            marketFiles.eventHandler.stopListening("Files Updated", onFilesUpdated);
-            canvas.eventHandler.stopListening("Drag Finished", onDragFinished);
-            thisObject.container.eventHandler.stopListening('Dimmensions Changed')
+            viewPort.eventHandler.stopListening(zoomChangedEventSubscriptionId);
+            viewPort.eventHandler.stopListening(offsetChangedEventSubscriptionId);
+            marketFiles.eventHandler.stopListening(filesUpdatedEventSubscriptionId);
+            canvas.eventHandler.stopListening(dragFinishedEventSubscriptionId);
+            thisObject.container.eventHandler.stopListening(dimmensionsChangedEventSubscriptionId)
 
             /* icons */
 
@@ -131,10 +137,10 @@
 
             /* Listen to the necesary events. */
 
-            viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged);
-            viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged);
-            marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated);
-            canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
+            zoomChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Zoom Changed", onZoomChanged);
+            offsetChangedEventSubscriptionId = viewPort.eventHandler.listenToEvent("Offset Changed", onOffsetChanged);
+            filesUpdatedEventSubscriptionId = marketFiles.eventHandler.listenToEvent("Files Updated", onFilesUpdated);
+            dragFinishedEventSubscriptionId = canvas.eventHandler.listenToEvent("Drag Finished", onDragFinished);
 
             /* Get ready for plotting. */
 
@@ -142,7 +148,7 @@
 
             /* Ready for when dimmension changes. */
 
-            thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () {
+            dimmensionsChangedEventSubscriptionId = thisObject.container.eventHandler.listenToEvent('Dimmensions Changed', function () {
                 recalculateScale()
                 recalculate();
             })