moonlight-stream/moonlight-chrome
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-chrome.git synced 2026-04-23 08:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display a loading bar until the NaCl plugin is loaded

Browse Source
This commit is contained in:
Cameron Gutman
2016-06-09 14:49:04 -05:00
parent f243685990
commit 27cdd06225
3 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
static/js/index.js
View File

@@ -6,6 +6,8 @@ var api;
// Called by the common.js module.
function attachListeners() {
changeUiModeForNaClLoad();
$('#selectResolution').on('change', saveResolution);
$('#selectFramerate').on('change', saveFramerate);
$('#bitrateSlider').on('input', updateBitrateField); // input occurs every notch you slide
@@ -33,6 +35,19 @@ function fullscreenChromeWindow() {
chrome.app.window.current().fullscreen();
}
function changeUiModeForNaClLoad() {
$("#main-content").children().not("#listener, #naclSpinner").hide();
$('#naclSpinnerMessage').text('Loading Moonlight plugin...');
$('#naclSpinner').css('display', 'inline-block');
}
function restoreUiAfterNaClLoad() {
$("#main-content").children().not("#listener, #naclSpinner, #gameSelection").show();
$('#naclSpinner').hide();
$('#loadingSpinner').css('display', 'none');
}
function snackbarLog(givenMessage) {
console.log(givenMessage);
var data = {
@@ -63,15 +78,17 @@ function moduleDidLoad() {
console.log('ERROR: failed to generate new cert!');
console.log('Returned error was: ' + failedCert);
}).then(function (ret) {
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]);
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
restoreUiAfterNaClLoad();
}, function (failedInit) {
console.log('ERROR: failed httpInit!');
console.log('Returned error was: ' + failedInit);
});
});
}
else {
sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) {
snackbarLog('Initialization complete.');
restoreUiAfterNaClLoad();
}, function (failedInit) {
console.log('ERROR: failed httpInit!');
console.log('Returned error was: ' + failedInit);
@@ -91,16 +108,6 @@ function updateHost() {
}
}
// we want the user to progress through the streaming process
// but to save from the PITA of inter-chrome-app-page JS message passing,
// I'm opting to do it in a single page, and keep the data around.
function hideAllWorkflowDivs() {
$('#streamSettings').css('display', 'inline-block');
$('#hostSettings').css('display', 'inline-block');
$('#gameSelection').css('display', 'none');
// do NOT hide the nacl module. you can't interact with it then
}
// pair to the given hostname or IP. Returns whether pairing was successful.
function pairTo(host) {
if(!pairingCert) {
@@ -233,7 +240,7 @@ function showApps() {
function showAppsMode() {
console.log("entering show apps mode.");
$(".mdl-layout__header").show();
$("#main-content").children().not("#listener, #loadingSpinner").show();
$("#main-content").children().not("#listener, #loadingSpinner, #naclSpinner").show();
$("#main-content").removeClass("fullscreen");
$("#listener").removeClass("fullscreen");
$("body").css('backgroundColor', 'white');