From b93ff48a9183eefa5f8049bcb4ea716a03251abc Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 12 Jun 2014 14:52:26 -0500
Subject: [PATCH] * fixing alert registration bug

---
 web/app/assets/javascripts/backend_alerts.js  |  2 +-
 web/app/assets/javascripts/utils.js           |  4 ++-
 web/app/assets/javascripts/voiceChatHelper.js | 35 ++++++++-----------
 .../assets/javascripts/wizard/gear_test.js    |  1 +
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/web/app/assets/javascripts/backend_alerts.js b/web/app/assets/javascripts/backend_alerts.js
index 15a5b33be..55e1636e3 100644
--- a/web/app/assets/javascripts/backend_alerts.js
+++ b/web/app/assets/javascripts/backend_alerts.js
@@ -70,7 +70,7 @@
       var alertData = ALERT_TYPES[type];
 
       if(alertData) {
-        $document.triggerHandler('alert.' + alertData.name, alertData);
+        $document.triggerHandler(alertData.name, alertData);
       }
 
       if (type === 2) { // BACKEND_MIXER_CHANGE
diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js
index 91f6a18af..309547003 100644
--- a/web/app/assets/javascripts/utils.js
+++ b/web/app/assets/javascripts/utils.js
@@ -449,12 +449,14 @@
   context.JK.onBackendEvent = function(type, namespace, callback) {
     var alertData = ALERT_TYPES[type];
     if(!alertData) {throw "onBackendEvent: unknown alert type " + type};
+    logger.debug("onBackendEvent: " + alertData.name + '.' + namespace)
     $(document).on(alertData.name + '.' + namespace, callback);
   }
 
   context.JK.offBackendEvent = function(type, namespace, callback) {
-    var alertData = ALERT_TYPES[type].name;
+    var alertData = ALERT_TYPES[type];
     if(!alertData) {throw "offBackendEvent: unknown alert type " + type};
+    logger.debug("offBackendEvent: " + alertData.name + '.' + namespace, alertData)
     $(document).off(alertData.name + '.' + namespace);
   }
   /*
diff --git a/web/app/assets/javascripts/voiceChatHelper.js b/web/app/assets/javascripts/voiceChatHelper.js
index a56eb4c76..57b269579 100644
--- a/web/app/assets/javascripts/voiceChatHelper.js
+++ b/web/app/assets/javascripts/voiceChatHelper.js
@@ -37,30 +37,23 @@
     }
 
     function onInvalidAudioDevice(e, data) {
-      var maxAlertTime = 5000;
-      if(new Date().getTime() - lastSavedTime.getTime() < maxAlertTime) {
-        $selectedChatInput = null;
-        // you can't do this in the event callback; it hangs the app indefinitely, and somehow 'sticks' the mic input into bad state until reboot
-        setTimeout(function() {
-          context.jamClient.FTUEClearChatInput();
-          context.jamClient.TrackSetChatEnable(true);
-          var result = context.jamClient.TrackSaveAssignments();
-          if(!result || result.length == 0) {
-            context.JK.Banner.showAlert('It appears the selected chat input is not functioning.  Please try another chat input.');
-          }
-          else {
-            context.JK.alertSupportedNeeded("Unable to unwind invalid chat input selection.")
-          }
-        }, 1);
-
-      }
-      else {
-        logger.debug("voiceChatHelper: invalid device event occurred, but not within " + maxAlertTime);
-      }
+      logger.debug("voice_chat_helper: onInvalidAudioDevice")
+      $selectedChatInput = null;
+      // you can't do this in the event callback; it hangs the app indefinitely, and somehow 'sticks' the mic input into bad state until reboot
+      setTimeout(function() {
+        context.jamClient.FTUEClearChatInput();
+        context.jamClient.TrackSetChatEnable(true);
+        var result = context.jamClient.TrackSaveAssignments();
+        if(!result || result.length == 0) {
+          context.JK.Banner.showAlert('It appears the selected chat input is not functioning.  Please try another chat input.');
+        }
+        else {
+          context.JK.alertSupportedNeeded("Unable to unwind invalid chat input selection.")
+        }
+      }, 1);
     }
 
     function beforeShow() {
-
       context.JK.onBackendEvent(ALERT_NAMES.AUDIO_DEVICE_NOT_PRESENT, 'voice_chat_helper', onInvalidAudioDevice);
     }
     function beforeHide() {
diff --git a/web/app/assets/javascripts/wizard/gear_test.js b/web/app/assets/javascripts/wizard/gear_test.js
index 3af2d5a0c..00c1ef062 100644
--- a/web/app/assets/javascripts/wizard/gear_test.js
+++ b/web/app/assets/javascripts/wizard/gear_test.js
@@ -290,6 +290,7 @@
     }
 
     function onInvalidAudioDevice() {
+      logger.debug("gear_test: onInvalidAudioDevice")
       asynchronousInvalidDevice = true;
       $self.triggerHandler(GEAR_TEST_INVALIDATED_ASYNC);
       context.JK.Banner.showAlert('Invalid Audio Device', 'It appears this audio device is not currently connected. Attach the device to your computer and restart the application, or select a different device.')