From cfeed312bf2ed5887299c5f264d26f20deb30ae7 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Tue, 14 Jan 2014 00:12:00 -0600 Subject: [PATCH] vrfs1008: refactoring --- web/app/assets/javascripts/createSession.js | 14 +++++++------- web/app/assets/javascripts/inviteMusicians.js | 6 +++--- web/app/assets/javascripts/session.js | 8 ++++---- web/app/views/clients/_inviteMusicians.html.erb | 2 +- web/app/views/clients/index.html.erb | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/web/app/assets/javascripts/createSession.js b/web/app/assets/javascripts/createSession.js index 4f8026dc0..ae3e5ff92 100644 --- a/web/app/assets/javascripts/createSession.js +++ b/web/app/assets/javascripts/createSession.js @@ -8,18 +8,18 @@ var rest = context.JK.Rest(); var realtimeMessaging = context.JK.JamServer; var invitationDialog = null; - var inviteMusiciansDialog = null; + var inviteMusiciansUtil = null; var MAX_GENRES = 1; var sessionSettings = {}; function beforeShow(data) { - inviteMusiciansDialog.clearSelections(); + inviteMusiciansUtil.clearSelections(); context.JK.GenreSelectorHelper.render('#create-session-genre'); resetForm(); } function afterShow(data) { - inviteMusiciansDialog.loadFriends(); + inviteMusiciansUtil.loadFriends(); } function resetForm() { @@ -164,7 +164,7 @@ data: jsonData, success: function(response) { var newSessionId = response.id; - var invitationCount = inviteMusiciansDialog.createInvitations(newSessionId, function() { + var invitationCount = inviteMusiciansUtil.createInvitations(newSessionId, function() { context.location = '#/session/' + newSessionId; }); // Re-loading the session settings will cause the form to reset with the right stuff in it. @@ -274,10 +274,10 @@ }); } - function initialize(invitationDialogInstance, inviteMusiciansDialogInstance) { + function initialize(invitationDialogInstance, inviteMusiciansUtilInstance) { invitationDialog = invitationDialogInstance; - inviteMusiciansDialog = inviteMusiciansDialogInstance; - inviteMusiciansDialog.inviteSessionCreate('#create-session-invite-musicians'); + inviteMusiciansUtil = inviteMusiciansUtilInstance; + inviteMusiciansUtil.inviteSessionCreate('#create-session-invite-musicians'); events(); loadBands(); loadSessionSettings(); diff --git a/web/app/assets/javascripts/inviteMusicians.js b/web/app/assets/javascripts/inviteMusicians.js index fa26c0429..98213fb16 100644 --- a/web/app/assets/javascripts/inviteMusicians.js +++ b/web/app/assets/javascripts/inviteMusicians.js @@ -3,7 +3,7 @@ "use strict"; context.JK = context.JK || {}; - context.JK.InviteMusiciansDialog = function(app) { + context.JK.InviteMusiciansUtil = function(app) { var logger = context.JK.logger; var userNames = []; var userIds = []; @@ -90,11 +90,11 @@ function addInvitation(value, data) { if ($('.selected-friends div[user-id=' + data + ']').length === 0) { var template = $('#template-added-invitation').html(); - var image_style = inviteAction == 'update' ? 'display:none' : ''; + var imgStyle = inviteAction == 'update' ? 'display:none' : ''; var invitationHtml = context.JK.fillTemplate(template, {userId: data, userName: value, - image_style: image_style}); + imageStyle: imgStyle}); $('.selected-friends').append(invitationHtml); $('#friend-input').select(); selectedFriendIds[data] = true; diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 569b011f9..e017d1de6 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -15,7 +15,7 @@ var localRecordingsDialog = null; var recordingFinishedDialog = null; var friendSelectorDialog = null; - var inviteMusiciansDialog = null; + var inviteMusiciansUtil = null; var screenActive = false; var currentMixerRangeMin = null; var currentMixerRangeMax = null; @@ -1305,7 +1305,7 @@ } function inviteMusicians() { - inviteMusiciansDialog.inviteSessionUpdate('#update-session-invite-musicians', sessionId); + inviteMusiciansUtil.inviteSessionUpdate('#update-session-invite-musicians', sessionId); } function events() { @@ -1326,10 +1326,10 @@ .on('change-position', onChangePlayPosition); } - this.initialize = function(localRecordingsDialogInstance, recordingFinishedDialogInstance, inviteMusiciansDialogInstance) { + this.initialize = function(localRecordingsDialogInstance, recordingFinishedDialogInstance, inviteMusiciansUtilInstance) { localRecordingsDialog = localRecordingsDialogInstance; recordingFinishedDialog = recordingFinishedDialogInstance; - inviteMusiciansDialog = inviteMusiciansDialogInstance; + inviteMusiciansUtil = inviteMusiciansUtilInstance; context.jamClient.SetVURefreshRate(150); playbackControls = new context.JK.PlaybackControls($('.session-recordings .recording-controls')); events(); diff --git a/web/app/views/clients/_inviteMusicians.html.erb b/web/app/views/clients/_inviteMusicians.html.erb index 3148e5daa..09999942c 100644 --- a/web/app/views/clients/_inviteMusicians.html.erb +++ b/web/app/views/clients/_inviteMusicians.html.erb @@ -33,6 +33,6 @@ diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb index d19151888..0f0e47fb3 100644 --- a/web/app/views/clients/index.html.erb +++ b/web/app/views/clients/index.html.erb @@ -106,8 +106,8 @@ var friendSelectorDialog = new JK.FriendSelectorDialog(JK.app); friendSelectorDialog.initialize(); - var inviteMusiciansDialog = new JK.InviteMusiciansDialog(JK.app); - inviteMusiciansDialog.initialize(friendSelectorDialog); + var inviteMusiciansUtil = new JK.InviteMusiciansUtil(JK.app); + inviteMusiciansUtil.initialize(friendSelectorDialog); var userDropdown = new JK.UserDropdown(JK.app); JK.UserDropdown = userDropdown; @@ -152,7 +152,7 @@ JK.Banner.initialize(); var createSessionScreen = new JK.CreateSessionScreen(JK.app); - createSessionScreen.initialize(invitationDialog, inviteMusiciansDialog); + createSessionScreen.initialize(invitationDialog, inviteMusiciansUtil); var bandSetupScreen = new JK.BandSetupScreen(JK.app); bandSetupScreen.initialize(invitationDialog, friendSelectorDialog); @@ -174,7 +174,7 @@ findBandScreen.initialize(); var sessionScreen = new JK.SessionScreen(JK.app); - sessionScreen.initialize(localRecordingsDialog, recordingFinishedDialog, inviteMusiciansDialog); + sessionScreen.initialize(localRecordingsDialog, recordingFinishedDialog, inviteMusiciansUtil); var sessionSettingsDialog = new JK.SessionSettingsDialog(JK.app, sessionScreen); sessionSettingsDialog.initialize();