Merge pull request #36 from zach-chai/cleanup_meetings

cleanup meetings

app/assets/javascripts/landing.js

@@ -13,6 +13,7 @@
   };
 
   var init = function() {
+    Meeting.clear();
 
     $('.center-panel-wrapper').on ('click', '.meeting-join', function (event) {
       var name = $('.meeting-user-name').val();
@@ -69,16 +70,17 @@
 
     $('.generate-link').click (function (e) {
       e.preventDefault();
+      var newId = Math.trunc(Math.random() * 1000000000);
+      $(".page-wrapper.meetings").data('id', newId);
       var link = window.location.protocol +
         '//' +
         window.location.hostname +
         '/meetings/' +
-        Math.trunc(Math.random() * 1000000000);
-
+        newId;
       $('.meeting-url').val(link);
     });
 
-    if (meetingId = $('.meeting-url').data('meetingId')) {
+    if (meetingId = $(".page-wrapper.meetings").data('id')) {
       var link = window.location.protocol +
         '//' +
         window.location.hostname +

app/assets/javascripts/meeting.coffee

@@ -9,18 +9,25 @@ class @Meeting
   @getInstance: ->
     if _meetingInstance
       return _meetingInstance
-    id = $(".page-wrapper.rooms").data('room')
-    url = @buildURL()
+    id = $(".page-wrapper").data('id')
+    url = @buildURL(id)
     name = $('.meeting-user-name').val()
     _meetingInstance = new Meeting(id, url, name)
     return _meetingInstance
 
-  @buildURL: ->
+  @clear: ->
+    _meetingInstance = null
+
+  @buildURL: (id) ->
+    if (resource = location.pathname.split('/')[1]) != 'rooms'
+      resource = 'meetings'
     return location.protocol +
       '//' +
       location.hostname +
-      '/rooms/' +
-      $('.rooms').data('room')
+      '/' +
+      resource +
+      '/' +
+      id;
 
   # Sends the end meeting request
   # Returns a response object

app/assets/javascripts/recordings.coffee

@@ -50,7 +50,7 @@ class @Recordings
               str = ''
               if row.published
                 for d in data
-                  str += '<a href="'+d.url+'">'+d.type+'</a> '
+                  str += '<a href="'+d.url+'">'+d.type_i18n+'</a> '
               return str
             return data
         },

app/views/bbb/recordings.jbuilder

@@ -1,26 +1,25 @@
 json.partial! 'bbb', messageKey: @messageKey, message: @message, status: @status
-unless @response.blank?
-  json.is_owner current_user == @user
-  json.recordings do
-    json.array!(@response) do |recording|
-      json.id recording[:recordID]
-      json.name recording[:name]
-      json.start_time recording[:startTime]
-      json.end_time recording[:endTime]
-      json.published recording[:published]
-      json.previews do
-        json.array!(recording[:previews]) do |preview|
-          json.partial! 'preview', preview: preview
-        end
+json.is_owner current_user == @user
+json.recordings do
+  json.array!(@response) do |recording|
+    json.id recording[:recordID]
+    json.name recording[:name]
+    json.start_time recording[:startTime]
+    json.end_time recording[:endTime]
+    json.published recording[:published]
+    json.previews do
+      json.array!(recording[:previews]) do |preview|
+        json.partial! 'preview', preview: preview
       end
-      json.playbacks do
-        json.array!(recording[:playbacks]) do |playback|
-          json.type t(playback[:type]) # translates the playback type
-          json.url playback[:url]
-          json.previews do
-            json.array!(playback[:previews]) do |preview|
-              json.partial! 'preview', preview: preview
-            end
+    end
+    json.playbacks do
+      json.array!(recording[:playbacks]) do |playback|
+        json.type playback[:type]
+        json.type_i18n t(playback[:type]) # translates the playback type
+        json.url playback[:url]
+        json.previews do
+          json.array!(playback[:previews]) do |preview|
+            json.partial! 'preview', preview: preview
           end
         end
       end

app/views/landing/meetings.html.erb

@@ -17,7 +17,7 @@
   <% end %>
 <% end %>
 
-<div class="page-wrapper meetings">
+<div class="page-wrapper meetings" data-id="<%= @meeting_id %>">
   <div class="container-fluid">
 
     <%= render 'shared/title', title: t('start_new_session') %>

app/views/landing/rooms.html.erb

@@ -4,7 +4,7 @@
   <% page_title= t('greet_guest', name: @user.username) %>
 <% end %>
 
-<div class="page-wrapper rooms" data-room="<%= @user.encrypted_id %>">
+<div class="page-wrapper rooms" data-id="<%= @user.encrypted_id %>">
   <div class="container-fluid">
 
     <%= render 'shared/title', title: page_title %>

app/views/shared/_meeting_url.html.erb

@@ -1,6 +1,6 @@
 <div <%= "hidden" if hidden %> class="meeting-url-wrapper">
   <div class="input-group">
-    <input type="text" readonly="readonly" class="form-control meeting-url" data-meeting-id="<%= @meeting_id %>" data-path="<%= @user.room_url if @user %>"/>
+    <input type="text" readonly="readonly" class="form-control meeting-url"/>
     <span class="input-group-btn">
       <button type="button" class="btn btn-default meeting-url-copy">
         <i class="fa fa-paperclip" aria-hidden="true"></i>