diff --git a/code/chat.js b/code/chat.js index 04cf5147..4d2725f6 100644 --- a/code/chat.js +++ b/code/chat.js @@ -530,7 +530,6 @@ window.chat.request = function() { chat.requestFaction(false); } if (channel == 'all' || (window.chat.backgroundChannels && window.chat.backgroundChannels['all'])) { - // the 'public', 'full' and 'compact' tabs are all based off the 'public' COMM data chat.requestPublic(false); } if (channel == 'alerts' || (window.chat.backgroundChannels && window.chat.backgroundChannels['alerts'])) { diff --git a/code/panes.js b/code/panes.js index 60edf1f9..34ba8f95 100644 --- a/code/panes.js +++ b/code/panes.js @@ -7,10 +7,9 @@ window.show = function(id) { switch(id) { case 'all': - window.chat.show('all'); - break; case 'faction': - window.chat.show('faction'); + case 'alerts': + window.chat.show(id); break; case 'alerts': window.chat.show('alerts'); diff --git a/mobile/src/com/cradle/iitc_mobile/compass/Compass.java b/mobile/src/com/cradle/iitc_mobile/compass/Compass.java index 43070e6d..958cb443 100644 --- a/mobile/src/com/cradle/iitc_mobile/compass/Compass.java +++ b/mobile/src/com/cradle/iitc_mobile/compass/Compass.java @@ -16,10 +16,9 @@ public abstract class Compass return new GyroCompass(context); else return new AccMagCompass(context); - } - private final ArrayList mListeners = new ArrayList(); + private final ArrayList mListeners = new ArrayList(); private boolean mStarted = false; protected abstract void onStart();