DFL-3415 Exception on disconnect after using the event listeners panel

Author: Chris K

src/build-application/build_application.js

@@ -86,7 +86,6 @@ window.app.profiles[window.app.profiles.HTTP_PROFILER].is_enabled = false;
 
 window.app.build_application = function(on_services_created, on_services_enabled)
 {
-
   var _find_compatible_version = function(version, version_list)
   {
     var
@@ -147,6 +146,8 @@ window.app.build_application = function(on_services_created, on_services_enabled
     builder = null,
     numbers = null;
 
+    window.messages.clear_session_listeners();
+
     for (service_name in service_descriptions)
     {
       service = service_descriptions[service_name];
@@ -221,7 +222,7 @@ window.app.build_application = function(on_services_created, on_services_enabled
   new cls.ServiceBase();
   new ActionBroker();
 
-  window.messages.addListener("application-setup", report_usage);
+  window.messages.addListener("application-setup", report_usage, true);
 
   // global objects
   window.tagManager = window.tag_manager = new window.cls.TagManager();

src/scripts/messages.js

@@ -147,25 +147,29 @@
  */
 var messages = new function()
 {
-  var __listeners = {};
+  var _listeners = {};
+  var _permanent_listeners = {};
 
   /**
    * Add a message listener
    * @param key {String} The name of the message to listen for
    * @param cb {function} The callback to call when message is received
    */
-  this.addListener = function(key, cb)
+  this.addListener = function(key, cb, is_permanent_listener)
   {
-    if (__listeners[key])
+    var lists = [_listeners];
+    if (is_permanent_listener)
+      lists.push(_permanent_listeners);
+
+    for (var i = 0, listeners; listeners = lists[i]; i++)
     {
-      if (__listeners[key].indexOf(cb) == -1)
+      if (listeners[key])
       {
-        __listeners[key].push(cb);
+        if (listeners[key].indexOf(cb) == -1)
+          listeners[key].push(cb);
       }
-    }
-    else
-    {
-      __listeners[key] = [cb];
+      else
+        listeners[key] = [cb];
     }
   };
 
@@ -178,15 +182,16 @@ var messages = new function()
    */
   this.removeListener = function(key, cb)
   {
-    var cur = null, listeners = __listeners[key], i = 0;
-    if (listeners)
+    var lists = [_listeners, _permanent_listeners];
+    for (var i = 0, listeners; listeners = lists[i]; i++)
     {
-      for (; cur = listeners[i]; i++)
+      var listeners_type = listeners[key];
+      if (listeners_type)
       {
-        if (cur == cb)
+        for (var j = listeners_type.length - 1, cur; cur = listeners_type[j]; j--)
         {
-          listeners.splice(i, 1);
-          i--;
+          if (cur == cb)
+            listeners_type.splice(j, 1);
         }
       }
     }
@@ -203,7 +208,7 @@ var messages = new function()
   this.post = function(key, msg)
   {
     msg || (msg = {});
-    var listeners = __listeners[key];
+    var listeners = _listeners[key];
     msg.type = key;
     if (listeners)
     {
@@ -213,4 +218,13 @@ var messages = new function()
       }
     }
   }
+
+  this.clear_session_listeners = function()
+  {
+    _listeners = {};
+    for (var key in _permanent_listeners)
+    {
+      _listeners[key] = _permanent_listeners[key].slice();
+    }
+  };
 }

src/ui-scripts/Switches.js

@@ -39,7 +39,7 @@ var SwitchesBase = function()
     }
   }.bind(this);
 
-  window.messages.addListener("setting-changed", this._on_setting_changed_bound);
+  window.messages.addListener("setting-changed", this._on_setting_changed_bound, true);
 }
 
 

src/ui-scripts/actions/globalactionhandler.js

@@ -400,7 +400,7 @@
         UIWindowBase.closeWindow('command_line');
       }
     }
-  });
+  }, true);
 
 };
 

src/ui-scripts/view.js

@@ -257,7 +257,7 @@ var ViewBase = new function()
     }
   }
 
-  window.messages.addListener("hide-view", onHideView);
+  window.messages.addListener("hide-view", onHideView, true);
   window.messages.addListener("profile-enabled", function(msg)
   {
     _ignore_updates = false;
@@ -278,7 +278,7 @@ var ViewBase = new function()
         }
       }
     }
-  });
+  }, true);
 
   window.messages.addListener("profile-disabled", function(msg)
   {
@@ -289,7 +289,7 @@ var ViewBase = new function()
     });
     // Updating the views will be done in the following "profile-enabled"
     // message.
-  });
+  }, true);
 
 }