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

* VRFS-852 fixed

This commit is contained in:
Seth Call 2013-11-16 15:36:23 +00:00
parent 95bc077634
commit 9c9c427b75
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/app/assets/javascripts/ftue.js
View File

@ -253,15 +253,7 @@
jamClient.TrackSetChatEnable(false);
}
var defaultInstrumentId;
if (context.JK.userMe.instruments && context.JK.userMe.instruments.length > 0) {
defaultInstrumentId = context.JK.instrument_id_to_instrument[context.JK.userMe.instruments[0].instrument_id].client_id;
}
else {
defaultInstrumentId = context.JK.server_to_client_instrument_map['Other'].client_id;
}
jamClient.TrackSetInstrument(1, defaultInstrumentId);
setDefaultInstrumentFromProfile();
logger.debug("Calling FTUESave(" + persist + ")");
var response = jamClient.FTUESave(persist);
@ -270,6 +262,7 @@
logger.warn(response);
// TODO - we may need to do something about errors on save.
// per VRFS-368, I'm hiding the alert, and logging a warning.
// context.alert(response);
}
} else {
logger.debug("Aborting FTUESave as we need input + output selected.");
@ -416,6 +409,19 @@
});
}
/** Once a configuration is decided upon, we set the user's default instrument based on data from their profile */
function setDefaultInstrumentFromProfile() {
var defaultInstrumentId;
if (context.JK.userMe.instruments && context.JK.userMe.instruments.length > 0) {
defaultInstrumentId = context.JK.instrument_id_to_instrument[context.JK.userMe.instruments[0].instrument_id].client_id;
}
else {
defaultInstrumentId = context.JK.server_to_client_instrument_map['Other'].client_id;
}
jamClient.TrackSetInstrument(1, defaultInstrumentId);
}
/**
* Handler for the new FTUE save button.
*/
@ -433,6 +439,9 @@
});
return false;
}
setDefaultInstrumentFromProfile();
jamClient.FTUESave(true);
jamClient.FTUESetStatus(true); // No FTUE wizard next time
rest.userCertifiedGear({success:true});
@ -693,10 +702,13 @@
}
function setAsioSettingsVisibility() {
logger.debug("jamClient.FTUEHasControlPanel()=" + jamClient.FTUEHasControlPanel());
if (jamClient.FTUEHasControlPanel()) {
logger.debug("Showing ASIO button");
$('#btn-asio-control-panel').show();
}
else {
logger.debug("Hiding ASIO button");
$('#btn-asio-control-panel').hide();
}
}