Suppressing alerts when hud is active; Fixing copy on events for hostiles without a system; Fixing sort order of hostiles/members; quelching console logs.

Author: rcreasey

app/js/Data.js

@@ -34,11 +34,11 @@ var Data = {
     dimmed: false,
     lastPollTs : moment().unix(),
     memberSortOrder: {
-      property: 'name',
+      property: 'characterName',
       order: 'asc'
     },
     hostileSortOrder: {
-      property: 'systemName',
+      property: 'characterName',
       order: 'asc'
     },
     pollLoop: 0

app/js/EventHandler.js

@@ -106,9 +106,12 @@ var EventHandler = {
       } else if (event.type === 'hostileTimedOut') {
         var hostile = event.data;
         event.text = '<a href="javascript:CCPEVE.showInfo(1377, '
-          + hostile.characterId + ');">' + hostile.characterName + '</a> contact lost in '
-          + '<a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');">'
-          + hostile.systemName + '</a>';
+          + hostile.characterId + ');">' + hostile.characterName + '</a> '
+          + ' contact lost '
+        if (hostile.systemId !== null ) {
+          event.text += 'in <a href="javascript:CCPEVE.showInfo(5, ' + hostile.systemId + ');"> ' 
+                     + hostile.systemName + '</a>';
+        }
         event.blink = 'hostiles';
         event.alert = true;
 

app/js/HostileList.js

@@ -1,35 +1,35 @@
 var HostileList = {
 
   clear: function () {
-    log('Clearing hostile list...');
+    // log('Clearing hostile list...');
     Data.hostiles = [];
     Data.ui.hostiles_list.empty();
   },
 
   clearBySystem: function (systemId) {
-    log('Clearing system ' + systemId);
+    // log('Clearing system ' + systemId);
     Data.hostiles = $.map(Data.hostiles, function(h) { return h.systemId !== +systemId ? h : null; });
     Data.ui.hostiles_list.empty();
   },
 
   addHostile: function (hostileToAdd) {
-    log('Adding hostile: ' + hostileToAdd.characterName + '...');
+    // log('Adding hostile: ' + hostileToAdd.characterName + '...');
     HostileList.removeHostile(hostileToAdd.characterId);
     Data.hostiles.push(hostileToAdd);
   },
 
   fadeHostile: function (hostileToFadeId) {
     var hostileToFade = HostileList.findHostile(hostileToFadeId);
     if (hostileToFade) {
-      log('Fading hostile: ' + hostileToFade.characterName + '...');
+      // log('Fading hostile: ' + hostileToFade.characterName + '...');
       hostileToFade.is_faded = true;
     }
   },
 
   removeHostile: function (hostileToRemoveId) {
     var hostileToRemove = HostileList.findHostile(hostileToRemoveId);
     if (hostileToRemove) {
-      log('Removing hostile: ' + hostileToRemove.characterName + '...');
+      // log('Removing hostile: ' + hostileToRemove.characterName + '...');
       Data.hostiles.splice(Data.hostiles.indexOf(hostileToRemove), 1);
     }
   },
@@ -47,7 +47,7 @@ var HostileList = {
   },
 
   renderSingleHostile: function (hostile) {
-    log('Rendering hostile: ' + hostile.characterName + ' (single)...');
+    // log('Rendering hostile: ' + hostile.characterName + ' (single)...');
     HostileList.addUiProperties(hostile);
     var existingHostileElement = Data.ui.hostiles_list.find('#hostile-' + hostile.characterId);
     if (existingHostileElement.length) {
@@ -58,7 +58,7 @@ var HostileList = {
   },
 
   sortAndRenderAll: function () {
-    log('Sorting and rendering all hostiles...');
+    // log('Sorting and rendering all hostiles...');
 
     Data.hostiles.sort(function (hostile1, hostile2) {
       if (hostile1[Data.state.hostileSortOrder.property] < hostile2[Data.state.hostileSortOrder.property]) {
@@ -72,7 +72,7 @@ var HostileList = {
 
     Data.ui.hostiles_list.empty();
     Data.hostiles.forEach(function (hostile) {
-      log('Rendering hostile: ' + hostile.characterName + ' (batch)...');
+      // log('Rendering hostile: ' + hostile.characterName + ' (batch)...');
       HostileList.addUiProperties(hostile);
       Data.ui.hostiles_list.append($(hostile.html));
     });

app/js/UI.js

@@ -59,6 +59,7 @@ var UI = {
   },
 
   showAlert: function (event) {
+    if ($('.menu-button.active').attr('id') === Data.ui.topMenu_hud.attr('id')) return;
     var alert = $(Data.templates.alert(event));
 
     alert.on('mouseover',function () {