proposed unsubscribe fix

abc91199 · Jan 12, 2016 · 62b7d0d · 62b7d0d
1 parent 17cd869
commit 62b7d0d
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/polymer/js/fin-hypergrid-excel.js b/polymer/js/fin-hypergrid-excel.js
@@ -177,8 +177,17 @@
          *
          */
         subscribeToBus: function() {
-            fin.desktop.InterApplicationBus.subscribe('*', this.subscribe, this.subscriptionCallback.bind(this));
-            fin.desktop.InterApplicationBus.subscribe('*', 'ExcelError', this.errorCallback.bind(this));
+            this.unSubscribeToBus(); // automatically cancel existing subscription, if any
+
+            if (this.subscribe.toLowerCase() !== 'null') {
+                this.busHandlers ={
+                    subscription: this.subscriptionCallback.bind(this),
+                    error: this.errorCallback.bind(this)
+                };
+
+                fin.desktop.InterApplicationBus.subscribe('*', this.subscribe, this.busHandlers.subscription);
+                fin.desktop.InterApplicationBus.subscribe('*', 'ExcelError', this.busHandlers.error);
+            }
         },
 
         /**
@@ -189,8 +198,11 @@
          *
          */
         unSubscribeToBus: function() {
-            fin.desktop.InterApplicationBus.unsubscribe('*', this.subscribe, this.subscriptionCallback.bind(this));
-            fin.desktop.InterApplicationBus.unsubscribe('*', 'ExcelError', this.errorCallback.bind(this));
+            if (this.busHandlers) {
+                fin.desktop.InterApplicationBus.unsubscribe('*', this.subscribe, this.busHandlers.subscription);
+                fin.desktop.InterApplicationBus.unsubscribe('*', 'ExcelError', this.busHandlers.error);
+                delete this.busHandlers;
+            }
         },
 
         /**