Merge pull request #86 from TF2Stadium/v0.3.3-alpha

v0.3.3-alpha

Author: mcapu

bower.json

@@ -13,7 +13,7 @@
     "angular-scroll-glue": "~2.0.6",
     "angular-ui-router": "~0.2.15",
     "clipboard": "~1.5.3",
-    "wsevent.js": "~0.0.4"
+    "wsevent.js": "~1.0.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.4.7"

package.json

@@ -4,7 +4,7 @@
   "license": "GPL-3.0",
   "repository": "https://github.com/TF2Stadium/Frontend",
   "readme": "readme.md",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "dependencies": {
     "del": "~1.2.0",
     "uglify-save-license": "~0.4.1",

src/app/pages/lobby/lobby.factory.js

@@ -228,23 +228,32 @@
         localStorage.setItem('tabCommunication', '');
         localStorage.setItem('tabCommunication', 'closeDialog');
       });
-
-      Notifications.notifyBrowser({
-        title: 'Click here to ready up!',
-        body: 'All the slots are filled, ready up to start',
-        timeout: 30,
-        callbacks: {
-          onclick: function () {
-            $window.focus();
+      Settings.getSettings(function (settings) {
+        Notifications.notifyBrowser({
+          title: 'Click here to ready up!',
+          body: 'All the slots are filled, ready up to start',
+          soundFile: '/assets/sound/lobby-readyup.wav',
+          soundVolume: settings.soundVolume * 0.01,
+          timeout: 30,
+          callbacks: {
+            onclick: function () {
+              $window.focus();
+            }
           }
-        }
+        });
       });
     });
 
     Websocket.onJSON('lobbyStart', function (data) {
       factory.lobbyJoinInformation = data;
-      $state.go('lobby-page', {lobbyID: factory.lobbySpectatedId});
       $rootScope.$emit('lobby-start');
+      Notifications.toast({
+        message: 'Your lobby has started!',
+        actionMessage: 'Go back',
+        action: function () {
+          factory.goToLobby(factory.lobbyJoinedId);
+        }
+      });
       Settings.getSettings(function (settings) {
         Notifications.notifyBrowser({
           title: 'Lobby is starting!',

src/app/pages/settings/section-theme.html

@@ -7,7 +7,8 @@ <h1>Theme</h1>
       {{theme.name}}
     </md-radio-button>
   </md-radio-group>
-
+</div>
+<div class="settings-section">
   <h1>Chat</h1>
   <h2>Timestamps</h2>
   <md-radio-group