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

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2017-06-26 15:00:47 -05:00
parent 5f1536f809 3f4f411eb6
commit cd9525ac2b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,8 @@
watchPreferencesEvent(app);
watchNetworkTestEvent(app);
initializeStun(app);
operationalEvents(app);
@ -77,6 +79,12 @@
});
}
function watchNetworkTestEvent(app) {
context.JK.onBackendEvent(ALERT_NAMES.SHOW_NETWORK_TEST, 'everywhere', function() {
app.layout.showDialog('network-test')
});
}
function checkMacOSXInstalledCorrectly() {
var os = context.jamClient.GetOSAsString();
// check if method exists at all for migration purposes

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

@ -139,7 +139,8 @@
VIDEO_WINDOW_CLOSED :50,
VST_CHANGED: 51, // VST state changed
SAMPLERATE_CONFIGURATION_BAD: 52,
LAST_ALERT : 53
SHOW_NETWORK_TEST: 53,
LAST_ALERT : 54
}
// recreate eThresholdType enum from MixerDialog.h
context.JK.ALERT_TYPES = {
@ -205,7 +206,8 @@
50: {"title": "", "message": ""}, // VIDEO_WINDOW_CLOSED
51: {"title": "", "message": ""}, // VST_CHANGED
52: {"title": "", "message": ""}, // SAMPLERATE_CONFIGURATION_BAD
53: {"title": "", "message": ""} // LAST_ALERT
53: {"title": "", "message": ""}, // SHOW_NETWORK_TEST
54: {"title": "", "message": ""} // LAST_ALERT
};
// add the alert's name to the ALERT_TYPES structure