Merge pull request #129 from zach-chai/previous_meetings

make previous meetings per room instead of global

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');

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

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,7 +44,10 @@ class @PreviousMeetings
       names = names.filter( (value) ->
         return $.inArray(value, meetings) == -1
       )
-      for m in names
+      PreviousMeetings.append(names)
+
+  @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>')

app/assets/javascripts/recordings.coffee

@@ -222,7 +222,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