From 053cd9a830443f5f6ceb8b4127b6b9a083d95588 Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Sun, 21 May 2017 18:22:28 +0200 Subject: [PATCH 1/8] Made the game grid accessible --- static/css/style.css | 4 ++-- static/js/index.js | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 25aadf4..0c87cfb 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -122,7 +122,7 @@ main { .mdl-dialog__title { padding: 24px 24px 0; margin: 0; - font-size: 2.5rem; + font-size: 2.5rem; } .mdl-dialog__content { padding: 20px 24px 24px 24px; @@ -191,7 +191,7 @@ main { cursor: pointer; transition: all .2s ease-in-out; } -#host-grid .mdl-card:hover, #game-grid .mdl-card:hover { +#host-grid .mdl-card:hover, #host-grid .mdl-card:focus, #host-grid .mdl-card:active, #game-grid .mdl-card:hover, #game-grid .mdl-card:focus, #game-grid .mdl-card:active { transform: scale(1.1); } #host-grid .mdl-card__title { diff --git a/static/js/index.js b/static/js/index.js index 15b5a37..b16271b 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -28,7 +28,7 @@ function fullscreenChromeWindow() { // FIRST restore it to the previous size, then fullscreen it to the whole screen // this prevents the previous window size from being 'maximized', // and allows us to functionally retain two window sizes - // so that when the user hits `esc`, they go back to the "restored" size, + // so that when the user hits `esc`, they go back to the "restored" size, // instead of "maximized", which would immediately go to fullscreen chrome.app.window.current().restore(); chrome.app.window.current().fullscreen(); @@ -192,14 +192,14 @@ function moduleDidLoad() { } if(!pairingCert) { // we couldn't load a cert. Make one. - console.log("Failed to load local cert. Generating new one"); + console.log("Failed to load local cert. Generating new one"); sendMessage('makeCert', []).then(function (cert) { storeData('cert', cert, null); pairingCert = cert; console.log("Generated new cert."); }, function (failedCert) { console.log('ERROR: failed to generate new cert!'); - console.log('Returned error was: ' + failedCert); + console.log('Returned error was: ' + failedCert); }).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { restoreUiAfterNaClLoad(); @@ -290,11 +290,11 @@ function hostChosen(host) { api = host; if (!host.paired) { // Still not paired; go to the pairing flow - pairTo(host, function() { - showApps(host); + pairTo(host, function() { + showApps(host); saveHosts(); - }, - function(){ + }, + function(){ startPollingHosts(); }); } else { @@ -351,7 +351,7 @@ function addHostToGrid(host, ismDNSDiscovered) { $(outerDiv).append(cell); if (!ismDNSDiscovered) { // we don't have the option to delete mDNS hosts. So don't show it to the user. - $(outerDiv).append(removalButton); + $(outerDiv).append(removalButton); } $('#host-grid').append(outerDiv); hosts[host.serverUid] = host; @@ -385,7 +385,7 @@ function removeClicked(host) { // and puts the CSS style for non-current app apps that aren't running // this requires a hot-off-the-host `api`, and the appId we're going to stylize // the function was made like this so that we can remove duplicated code, but -// not do N*N stylizations of the box art, or make the code not flow very well +// not do N*N stylizations of the box art, or make the code not flow very well function stylizeBoxArt(freshApi, appIdToStylize) { if (freshApi.currentGame === appIdToStylize){ // stylize the currently running game // destylize it, if it has the not-current-game style @@ -429,7 +429,7 @@ function showApps(host) { // to mitigate this we ensure we don't add a duplicate. // This isn't perfect: there's lots of RTTs before the logic prevents anything var imageBlob = new Blob([resolvedPromise], {type: "image/png"}); - var outerDiv = $("
", {class: 'game-container mdl-card mdl-shadow--4dp', id: 'game-'+app.id, backgroundImage: URL.createObjectURL(imageBlob) }); + var outerDiv = $("
", {class: 'game-container mdl-card mdl-shadow--4dp', id: 'game-'+app.id, backgroundImage: URL.createObjectURL(imageBlob), role: 'link', tabindex: 0, title: app.title, 'aria-label': app.title }); $(outerDiv).append($("", {src: URL.createObjectURL(imageBlob), id: 'game-'+app.id, name: app.title })); $(outerDiv).append($("
", {class: "game-title", html: $("", {html: app.title} )})); $("#game-grid").append(outerDiv); @@ -529,7 +529,7 @@ function startGame(host, appID) { if(host.currentGame != 0 && host.currentGame != appID) { host.getAppById(host.currentGame).then(function (currentApp) { var quitAppDialog = document.querySelector('#quitAppDialog'); - document.getElementById('quitAppDialogText').innerHTML = + document.getElementById('quitAppDialogText').innerHTML = currentApp.title + ' is already running. Would you like to quit ' + currentApp.title + '?'; quitAppDialog.showModal(); @@ -677,7 +677,7 @@ function stopGame(host, callbackFunction) { } var appName = runningApp.title; snackbarLog('Stopping ' + appName); - host.quitApp().then(function (ret2) { + host.quitApp().then(function (ret2) { host.refreshServerInfo().then(function (ret3) { // refresh to show no app is currently running. showAppsMode(); stylizeBoxArt(host, runningApp.id); From 850862c1d120f8d2db9e6480ca57d1a86c8268cb Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Sun, 21 May 2017 18:26:03 +0200 Subject: [PATCH 2/8] Quit app button now announces correctly --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 9159c2f..2a7f1a0 100644 --- a/index.html +++ b/index.html @@ -81,7 +81,7 @@ Remote audio
- @@ -171,4 +171,4 @@
- \ No newline at end of file + From 9cd90d5a8d1b1d159044fa5dfbe427e629115198 Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Sun, 21 May 2017 18:28:22 +0200 Subject: [PATCH 3/8] Back button is now recognised --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2a7f1a0..5281f07 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
- keyboard_arrow_left + keyboard_arrow_left MOONLIGHT From 868903236934c49173f3c98e33722e46f63a7ef3 Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Sun, 21 May 2017 18:35:10 +0200 Subject: [PATCH 4/8] Host grid accessible --- index.html | 2 +- static/js/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 5281f07..854b609 100644 --- a/index.html +++ b/index.html @@ -92,7 +92,7 @@
Your PCs
-
+

Add Host

diff --git a/static/js/index.js b/static/js/index.js index b16271b..12c16d2 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -336,10 +336,10 @@ function addHost() { // host is an NvHTTP object function addHostToGrid(host, ismDNSDiscovered) { - var outerDiv = $("
", {class: 'host-container mdl-card mdl-shadow--4dp', id: 'host-container-' + host.serverUid }); + var outerDiv = $("
", {class: 'host-container mdl-card mdl-shadow--4dp', id: 'host-container-' + host.serverUid, role: 'link', tabindex: 0, 'aria-label': host.hostname }); var cell = $("
", {class: 'mdl-card__title mdl-card--expand', id: 'hostgrid-' + host.serverUid }); $(cell).prepend($("

", {class: "mdl-card__title-text", html: host.hostname})); - var removalButton = $("
", {class: "remove-host", id: "removeHostButton-" + host.serverUid}); + var removalButton = $("
", {class: "remove-host", id: "removeHostButton-" + host.serverUid, role: 'button', tabindex: 0, 'aria-label': 'Remove host ' + host.hostname}); removalButton.off('click'); removalButton.click(function () { removeClicked(host); From 8e601a957730a1b27259dc990bbf65f2a0790abe Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Tue, 23 May 2017 17:41:03 +0200 Subject: [PATCH 5/8] Added enter keyboard action for grids --- static/css/style.css | 3 --- static/js/index.js | 10 ++++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 0c87cfb..f2a1a82 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -105,10 +105,7 @@ main { padding:25px; } #backIcon { - width: 32px; - height: 24px; position: fixed; - top: 16px; left: 28px; } #backIcon:hover { diff --git a/static/js/index.js b/static/js/index.js index 12c16d2..12793dd 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -348,6 +348,11 @@ function addHostToGrid(host, ismDNSDiscovered) { cell.click(function () { hostChosen(host); }); + outerDiv.keypress(function(e){ + if(e.keyCode == 13) { + hostChosen(host); + } + }); $(outerDiv).append(cell); if (!ismDNSDiscovered) { // we don't have the option to delete mDNS hosts. So don't show it to the user. @@ -439,6 +444,11 @@ function showApps(host) { $('#game-'+app.id).on('click', function () { startGame(host, app.id); }); + $('#game-'+app.id).keypress(function(e){ + if(e.keyCode == 13) { + startGame(host, app.id); + } + }); // apply CSS stylization to indicate whether the app is active stylizeBoxArt(host, app.id); From 59e7adb32fc1b17181ae30dd10b326c8c6f83ee3 Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Tue, 23 May 2017 17:42:29 +0200 Subject: [PATCH 6/8] Changed the back-button to be a mdl component --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 854b609..3e6c4f3 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
- keyboard_arrow_left + MOONLIGHT From d2a2542e5b23d6f4542decb8cf747427d9f29bfb Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Tue, 23 May 2017 17:44:34 +0200 Subject: [PATCH 7/8] go-back button now properly announced --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 3e6c4f3..d783347 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,7 @@
- + MOONLIGHT From 2fc6b10cc91b0b2bc2dc0dece31a902fabfc8eca Mon Sep 17 00:00:00 2001 From: Paulin Jorys Date: Fri, 23 Jun 2017 16:12:30 +0200 Subject: [PATCH 8/8] Fixed lint errors --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index d783347..59d7365 100644 --- a/index.html +++ b/index.html @@ -61,7 +61,7 @@
- +
@@ -91,7 +91,7 @@
Your PCs
-
+

Add Host

@@ -168,7 +168,7 @@
- +