* adding websocket connect on /

2014-06-27 14:25:26 -05:00 · 2014-06-27 14:25:26 -05:00 · aedd719b7f
parent b130818011
commit aedd719b7f
4 changed files with 8 additions and 2 deletions
--- a/web/app/assets/stylesheets/client/jamServer.css.scss
+++ b/web/app/assets/stylesheets/client/jamServer.css.scss
@ -66,4 +66,3 @@

  }
 }
-
--- a/web/app/assets/stylesheets/web/main.css.scss
+++ b/web/app/assets/stylesheets/web/main.css.scss
@ -589,4 +589,8 @@ strong {
  fieldset.login-error .login-error-msg {
    display:block;
  }
+}
+
+body.jam.web.welcome .no-websocket-connection {
+  display:none;
 }
--- a/web/app/views/layouts/web.html.erb
+++ b/web/app/views/layouts/web.html.erb
@ -31,7 +31,7 @@
        <%= render "layouts/social_meta" %>
    <% end %>
  </head>
-  <body class="web jam">
+  <body class="web jam <%= yield(:page_name) %>">
    <%= javascript_include_tag "web/web" %>
    <div class="dialog-overlay op70" style="display:none; width:100%; height:100%; z-index:99;"></div>

@ -108,6 +108,7 @@
            <% end %>

            JK.app = JK.JamKazam();
+
            var jamServer = new JK.JamServer(JK.app, $.noop);
            jamServer.initialize();

--- a/web/app/views/users/welcome.html.haml
+++ b/web/app/views/users/welcome.html.haml
@ -1,3 +1,5 @@
+- provide(:page_name, 'welcome')
+
 .welcome
  .landing-tag
    %h1 Play music together over the Internet as if in the same room