From 7b52e2ef619b8f255aa8967f210736a24dfadde6 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Tue, 21 Feb 2017 10:33:58 -0500
Subject: [PATCH] make previous meetings per room instead of global

---
 app/assets/javascripts/landing.js             |  3 ++-
 app/assets/javascripts/meeting.coffee         |  2 +-
 .../javascripts/previous_meetings.coffee      | 25 +++++++++----------
 app/assets/javascripts/recordings.coffee      |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 73dd1116..39471219 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -192,6 +192,7 @@
 
   var initRooms = function() {
     displayRoomURL();
+    var roomAdmin = $('.page-wrapper.rooms').data('admin-id');
 
     $('.center-panel-wrapper').on('input', '.meeting-name', function (event, msg) {
       var newId = $(this).val();
@@ -206,7 +207,7 @@
     });
 
     if ($(".page-wrapper.rooms").data('main-room')) {
-      PreviousMeetings.init('joinedRooms');
+      PreviousMeetings.init('joinedRooms-'+roomAdmin);
 
       if ($('input.meeting-name').val() !== '') {
         $('input.meeting-name').trigger('input');
diff --git a/app/assets/javascripts/meeting.coffee b/app/assets/javascripts/meeting.coffee
index 7cbfd321..8421ef52 100644
--- a/app/assets/javascripts/meeting.coffee
+++ b/app/assets/javascripts/meeting.coffee
@@ -72,7 +72,7 @@ class @Meeting
         if @type == 'meetings'
           key = 'joinedMeetings'
         else if @type == 'rooms'
-          key = 'joinedRooms'
+          key = 'joinedRooms-'+@adminId
 
         # update previously joined meetings/rooms on client
         try
diff --git a/app/assets/javascripts/previous_meetings.coffee b/app/assets/javascripts/previous_meetings.coffee
index 3a6b5723..b9ff6a47 100644
--- a/app/assets/javascripts/previous_meetings.coffee
+++ b/app/assets/javascripts/previous_meetings.coffee
@@ -19,6 +19,7 @@
 class @PreviousMeetings
   MAX_MEETINGS = 5
 
+  # initializes and populates previous meetings list with entries from localStorage
   @init: (type) ->
     $('.center-panel-wrapper').off 'click', '.fill-meeting-name'
     $('.center-panel-wrapper').on 'click', '.fill-meeting-name', (event, msg) ->
@@ -29,15 +30,10 @@ class @PreviousMeetings
     joinedMeetings = localStorage.getItem(type)
     if joinedMeetings && joinedMeetings.length > 0
       joinedMeetings = joinedMeetings.split(',')
+      PreviousMeetings.append(joinedMeetings.reverse())
 
-      for m in joinedMeetings by -1
-        if $('ul.previously-joined > li').length > MAX_MEETINGS
-          break
-        $('ul.previously-joined').append('<li><a class="fill-meeting-name">'+m+'</a></li>')
-
-      $('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden')
-
-  @add: (names) ->
+  # adds to previous meetings list if its unique
+  @uniqueAdd: (names) ->
     meetings = $('ul.previously-joined > li').toArray().map( (li) ->
       return li.innerText
     )
@@ -48,9 +44,12 @@ class @PreviousMeetings
       names = names.filter( (value) ->
         return $.inArray(value, meetings) == -1
       )
-      for m in names
-        if $('ul.previously-joined > li').length > MAX_MEETINGS
-          break
-        $('ul.previously-joined').append('<li><a class="fill-meeting-name">'+m+'</a></li>')
+      PreviousMeetings.append(names)
 
-      $('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden')
+  @append: (meeting_names) ->
+    for m in meeting_names
+      if $('ul.previously-joined > li').length > MAX_MEETINGS
+        break
+      $('ul.previously-joined').append('<li><a class="fill-meeting-name">'+m+'</a></li>')
+
+    $('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden')
diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index 03462349..f63656b7 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -216,7 +216,7 @@ class @Recordings
         output = {}
         for key in [0...recording_names.length]
           output[recording_names[key]] = recording_names[key]
-        PreviousMeetings.add(value for key, value of output)
+        PreviousMeetings.uniqueAdd(value for key, value of output)
 
 
   # setup click handlers for the action buttons