From 8317748442a7777153fe8a6c45aabacf638bbb19 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Sun, 3 Mar 2019 14:55:39 +0100
Subject: [PATCH] integrate destroy functions from js utilities in setup
 utility

---
 static/js/utils/setup.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/static/js/utils/setup.js b/static/js/utils/setup.js
index 36e61a9b7..6ed7c4a35 100644
--- a/static/js/utils/setup.js
+++ b/static/js/utils/setup.js
@@ -14,6 +14,8 @@
 
   window.utils.setup = function(utilName, scope, options) {
 
+    var utilInstance;
+
     if (!utilName || !scope) {
       return;
     }
@@ -27,21 +29,21 @@
       }
 
       if (options.setupFunction) {
-        options.setupFunction(scope, options);
+        utilInstance = options.setupFunction(scope, options);
       } else {
         var util = window.utils[utilName];
         if (!util) {
           throw new Error('"' + utilName + '" is not a known js util');
         }
 
-        util(scope, options);
+        utilInstance = util(scope, options);
       }
     };
 
+    window.utils.teardown(utilName);
     if (registeredSetupListeners[utilName] && !options.singleton) {
       registeredSetupListeners[utilName].push(listener);
     } else {
-      window.utils.teardown(utilName);
       registeredSetupListeners[utilName] = [ listener ];
     }
 
@@ -52,6 +54,8 @@
       bubbles: true,
       cancelable: true,
     }));
+
+    return utilInstance;
   };
 
   window.utils.teardown = function(utilName) {