From 9863485e910d40b05848cd94f3912aa62080fc34 Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 23 Apr 2019 22:25:48 +0200
Subject: [PATCH] Finalize for Container

---
 Container.js       | 11 +++++++++++
 PlottersManager.js |  1 +
 2 files changed, 12 insertions(+)

diff --git a/Container.js b/Container.js
index 8ea75ce14..bbb4d93ed 100644
--- a/Container.js
+++ b/Container.js
@@ -10,15 +10,25 @@ function newContainer () {
     isWheelable: false,
     name: undefined,
     initialize: initialize,
+    finalize: finalize,
     connectToParent: connectToParent,
     isForThisPurpose: isForThisPurpose
   }
 
   let connectedToParentWidth = false
   let connectedToParentHeight = false
+  let isConnectedToParent = false
 
   return thisObject
 
+  function finalize () {
+    if (isConnectedToParent === true) {
+      thisObject.parentContainer.eventHandler.stopListening('Dimmensions Changed', onParentDimmensionsChanged)
+      thisObject.parentContainer.eventHandler.stopListening('onMouseOver', onMouseOver)
+      thisObject.parentContainer.eventHandler.stopListening('onMouseNotOver', onMouseNotOver)
+    }
+  }
+
   function initialize (pName) {
     thisObject.name = pName
 
@@ -39,6 +49,7 @@ function newContainer () {
   function connectToParent (parentContainer, onWidth, onHeight) {
     connectedToParentWidth = onWidth
     connectedToParentHeight = onHeight
+    isConnectedToParent = true
 
     thisObject.displacement.parentDisplacement = parentContainer.displacement
     thisObject.frame.parentFrame = parentContainer.frame
diff --git a/PlottersManager.js b/PlottersManager.js
index f868af859..99e544dcb 100644
--- a/PlottersManager.js
+++ b/PlottersManager.js
@@ -619,6 +619,7 @@ function newPlottersManager () {
           productPlotters[i].storage.finalize()
 
           if (productPlotters[i].plotter.finalize !== undefined) {
+            productPlotters[i].plotter.container.finalize()
             productPlotters[i].plotter.finalize()
           }