From b30acae006e26fe40aabfd414c284c6a2de2b402 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Tue, 24 Jan 2017 14:25:25 -0500
Subject: [PATCH] refactor meeting object naming

---
 app/assets/javascripts/landing.js        |  6 ++---
 app/assets/javascripts/meeting.coffee    | 30 ++++++++++++------------
 app/assets/javascripts/recordings.coffee |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index ff41775f..385fa99e 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -41,8 +41,8 @@
     // setup event handlers
     $('.center-panel-wrapper').on ('click', '.meeting-join', function (event) {
       var name = $('.meeting-user-name').val();
-      Meeting.getInstance().setName(name);
-      Meeting.getInstance().setId($(".page-wrapper").data('id'));
+      Meeting.getInstance().setUserName(name);
+      Meeting.getInstance().setMeetingId($(".page-wrapper").data('id'));
 
       // a user name is set, join the user into the session
       if (name !== undefined && name !== null) {
@@ -159,7 +159,7 @@
     $('.generate-link').click (function (e) {
       e.preventDefault();
       var newId = Math.trunc(Math.random() * 1000000000);
-      Meeting.getInstance().setId(newId);
+      Meeting.getInstance().setMeetingId(newId);
       $(".page-wrapper.meetings").data('id', newId);
       $('.meeting-url').val(Meeting.getInstance().getURL());
     });
diff --git a/app/assets/javascripts/meeting.coffee b/app/assets/javascripts/meeting.coffee
index 7364a5ea..9b13a1a4 100644
--- a/app/assets/javascripts/meeting.coffee
+++ b/app/assets/javascripts/meeting.coffee
@@ -19,7 +19,7 @@
 _meetingInstance = null
 
 class @Meeting
-  constructor: (@id, @type, @name) ->
+  constructor: (@meetingId, @type, @userName) ->
 
   # Gets the current instance or creates a new one
   @getInstance: ->
@@ -56,28 +56,28 @@ class @Meeting
   # Returns a response object
   #    The response object contains the URL to join the meeting
   getJoinMeetingResponse: ->
-    return $.get @getURL() + "/join?name=" + @name, (data) =>
+    return $.get @getURL() + "/join?name=" + @userName, (data) =>
       if data.messageKey == 'ok' && @type == 'meetings'
         # update name used to join meeting
-        localStorage.setItem('lastJoinedName', @getName())
+        localStorage.setItem('lastJoinedName', @getUserName())
 
         # update previously joined meetings on client
         try
           joinedMeetings = localStorage.getItem('joinedMeetings') || ''
           joinedMeetings = joinedMeetings.split(',')
-          joinedMeetings = joinedMeetings.filter (item) => item != @id.toString()
+          joinedMeetings = joinedMeetings.filter (item) => item != @meetingId.toString()
           if joinedMeetings.length >= 5
             joinedMeetings.splice(0, 1)
-          joinedMeetings.push(@id)
+          joinedMeetings.push(@meetingId)
           localStorage.setItem('joinedMeetings', joinedMeetings.join(','))
         catch err
-          localStorage.setItem('joinedMeetings', @id)
+          localStorage.setItem('joinedMeetings', @meetingId)
 
-  getId: ->
-    return @id
+  getMeetingId: ->
+    return @meetingId
 
-  setId: (id) ->
-    @id = id
+  setMeetingId: (id) ->
+    @meetingId = id
     return this
 
   getType: ->
@@ -88,13 +88,13 @@ class @Meeting
     return this
 
   getURL: ->
-    return Meeting.buildMeetingURL(@id, @type)
+    return Meeting.buildMeetingURL(@meetingId, @type)
 
-  getName: ->
-    return @name
+  getUserName: ->
+    return @userName
 
-  setName: (name) ->
-    @name = name
+  setUserName: (name) ->
+    @userName = name
     return this
 
   getModJoined: ->
diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index a4c69396..0a53ca98 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -80,7 +80,7 @@ class @Recordings
           targets: -1,
           render: (data, type, row) ->
             if type == 'display'
-              roomName = Meeting.getInstance().getId()
+              roomName = Meeting.getInstance().getMeetingId()
               recordingActions = $('.hidden-elements').find('.recording-actions')
               classes = ['recording-unpublished', 'recording-unlisted', 'recording-published']
               if row.published
@@ -157,7 +157,7 @@ class @Recordings
   # refresh the recordings from the server
   refresh: ->
     table_api = this.table.api()
-    $.get "/rooms/"+Meeting.getInstance().getId()+"/recordings", (data) =>
+    $.get "/rooms/"+Meeting.getInstance().getMeetingId()+"/recordings", (data) =>
       @setOwner(data.is_owner)
       if !@owner
         table_api.column(-1).visible(false)