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-3139 - hide jamkazam virtual input text in account summary screen

This commit is contained in:
Seth Call 2015-05-01 12:16:13 -05:00
parent 1cd57cb4e8
commit 7dec27083b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
var rest = context.JK.Rest();
var userId;
var user = {};
var gearUtils = context.JK.GearUtilsInstance;
function beforeShow(data) {
console.log("beforeShow", data)
@ -90,7 +90,11 @@
var delimiter = ", ";
if (profileMap && profileMap.length > 0) {
$.each(profileMap, function(index, val) {
profiles += val.name + delimiter;
var inputName = val.name;
if (inputName == gearUtils.JAMKAZAM_VIRTUAL_INPUT) {
inputName = gearUtils.SYSTEM_DEFAULT_PLAYBACK_ONLY;
}
profiles += inputName + delimiter;
});
return profiles.substring(0, profiles.length - delimiter.length);

5
web/app/assets/javascripts/wizard/gear_utils.js
View File

@ -16,11 +16,14 @@
var AUDIO_DEVICE_BEHAVIOR = context.JK.AUDIO_DEVICE_BEHAVIOR;
var EVENTS = context.JK.EVENTS;
var SYSTEM_DEFAULT_PLAYBACK_ONLY = 'System Default (Playback Only)';
var JAMKAZAM_VIRTUAL_INPUT = "JamKazam Virtual Input";
context.JK.GearUtilsInstance = gearUtils;
gearUtils.SKIPPED_NETWORK_TEST = -1; // we store a negative 1 to mean that we let the user skip.
gearUtils.SYSTEM_DEFAULT_PLAYBACK_ONLY = SYSTEM_DEFAULT_PLAYBACK_ONLY;
gearUtils.JAMKAZAM_VIRTUAL_INPUT = JAMKAZAM_VIRTUAL_INPUT;
gearUtils.skippedNetworkTest = false; // we allow someone to play in session (for one client run) if it's our fault they can't network test score
var reloadAudioTimeout = null;
@ -205,7 +208,7 @@
return;
}
if (device.name == "JamKazam Virtual Input") {
if (device.name == JAMKAZAM_VIRTUAL_INPUT) {
return;
}