seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

vrfs1008: refactoring

This commit is contained in:
Jonathan Kolyer 2014-01-14 00:12:00 -06:00
parent 28d346fe23
commit cfeed312bf
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/app/assets/javascripts/createSession.js
View File

@ -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();

6
web/app/assets/javascripts/inviteMusicians.js
View File

@ -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;

8
web/app/assets/javascripts/session.js
View File

@ -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();

2
web/app/views/clients/_inviteMusicians.html.erb
View File

@ -33,6 +33,6 @@
<!-- Added Invitation Template -->
<script type="text/template" id="template-added-invitation">
<div user-id="{userId}" class="invitation">{userName}
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13", :style => "{image_style}" %></a>
<a><%= image_tag "shared/icon_delete_sm.png", :size => "13x13", :style => "{imageStyle}" %></a>
</div>
</script>

8
web/app/views/clients/index.html.erb
View File

@ -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();