From 0c4e264d7eef76862d4cae1e6fa86121151d07db Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Tue, 1 Nov 2016 17:18:39 -0400
Subject: [PATCH] set room name in html

---
 app/assets/javascripts/channels/moderator_joins.js  | 2 +-
 app/assets/javascripts/channels/recording_update.js | 2 +-
 app/assets/javascripts/landing.js                   | 4 ++--
 app/assets/javascripts/shared.js                    | 4 ++++
 app/views/landing/rooms.html.erb                    | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/channels/moderator_joins.js b/app/assets/javascripts/channels/moderator_joins.js
index 3b1339da..fdea002c 100644
--- a/app/assets/javascripts/channels/moderator_joins.js
+++ b/app/assets/javascripts/channels/moderator_joins.js
@@ -3,7 +3,7 @@
   var initRooms = function() {
     App.messages = App.cable.subscriptions.create({
       channel: 'ModeratorJoinsChannel',
-      username: window.location.pathname.split('/').pop()
+      username: getRoomName()
     },
     {
       received: function(data) {
diff --git a/app/assets/javascripts/channels/recording_update.js b/app/assets/javascripts/channels/recording_update.js
index aae65063..23c8a387 100644
--- a/app/assets/javascripts/channels/recording_update.js
+++ b/app/assets/javascripts/channels/recording_update.js
@@ -3,7 +3,7 @@
   var initRooms = function() {
     App.messages = App.cable.subscriptions.create({
       channel: 'RecordingUpdatesChannel',
-      username: window.location.pathname.split('/').pop()
+      username: getRoomName()
     },
     {
       received: function(data) {
diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 86bab1b1..00eaa4f5 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -112,7 +112,7 @@
           targets: -1,
           render: function(data, type, row) {
             if (type === 'display') {
-              var roomName = window.location.pathname.split('/').pop();
+              var roomName = getRoomName();
               var published = row.published;
               var eye = getPublishClass(published);
               return '<button type="button" class="btn btn-default recording-update" data-id="'+data+'" data-room="'+roomName+'" data-published="'+published+'">' +
@@ -162,7 +162,7 @@
       return;
     }
     table = recordingsTable.api();
-    $.get("/rooms/"+window.location.pathname.split('/').pop()+"/recordings", function(data) {
+    $.get("/rooms/"+getRoomName()+"/recordings", function(data) {
       if (!data.is_owner) {
         table.column(-1).visible( false );
       }
diff --git a/app/assets/javascripts/shared.js b/app/assets/javascripts/shared.js
index a2488f93..b7d369a4 100644
--- a/app/assets/javascripts/shared.js
+++ b/app/assets/javascripts/shared.js
@@ -4,6 +4,10 @@ $.ajaxSetup({
   }
 });
 
+var getRoomName = function() {
+  return $(".page-wrapper.rooms").data('room');
+}
+
 var PUBLISHED_CLASSES = ['fa-eye-slash', 'fa-eye']
 
 var getPublishClass = function(published) {
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 810489a4..52f6e778 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -16,7 +16,7 @@
   </div>
 <% end %>
 
-<div class="page-wrapper rooms">
+<div class="page-wrapper rooms" data-room="<%= @user.username %>">
   <div class="container-fluid">
 
     <%= render 'shared/title', title: page_title %>