unify the UI into a single page

This commit is contained in:
Aidan Campbell 2016-02-15 16:06:15 -05:00
parent b634ab84f1
commit 5145012d59
2 changed files with 3 additions and 6 deletions

View File

@ -8,7 +8,6 @@
<script type="text/javascript" src="index.js"></script> <script type="text/javascript" src="index.js"></script>
</head> </head>
<body data-name="moonlight-chrome" data-width="1280" data-height="720" data-tools="pnacl" data-configs="Debug Release" data-path="{tc}/{config}"> <body data-name="moonlight-chrome" data-width="1280" data-height="720" data-tools="pnacl" data-configs="Debug Release" data-path="{tc}/{config}">
<div id="title"> <div id="title">
<h1>Moonlight Streaming</h1> <h1>Moonlight Streaming</h1>
<h2>Chrome App Status: <code id="statusField">NO-STATUS</code></h2> <h2>Chrome App Status: <code id="statusField">NO-STATUS</code></h2>
@ -50,4 +49,3 @@
<div id="listener"></div> <div id="listener"></div>
</body> </body>
</html> </html>

View File

@ -24,12 +24,13 @@ function hideAllWorkflowDivs() {
// pair button was pushed. pass what the user entered into the GFEHostIPField. // pair button was pushed. pass what the user entered into the GFEHostIPField.
function pairPushed() { function pairPushed() {
common.naclModule.postMessage('pair:' + document.getElementById('GFEHostIPField').value); // common.naclModule.postMessage('pair:' + document.getElementById('GFEHostIPField').value);
} }
// someone pushed the "show apps" button. // someone pushed the "show apps" button.
// if they entered something in the GFEHostIPField, use that. // if they entered something in the GFEHostIPField, use that.
// otherwise, we assume they selected from the host history dropdown. // otherwise, we assume they selected from the host history dropdown.
// TODO: pass the host info to the appChoose screen
function showAppsPushed() { function showAppsPushed() {
var target = document.getElementById('GFEHostIPField').value; var target = document.getElementById('GFEHostIPField').value;
if (target == null || target == "127.0.0.1") { if (target == null || target == "127.0.0.1") {
@ -74,6 +75,4 @@ function stopPushed() {
function handleMessage(msg) { function handleMessage(msg) {
var logEl = document.getElementById('logField'); var logEl = document.getElementById('logField');
logEl.innerHTML = msg.data; logEl.innerHTML = msg.data;
} }
// window.onload = hideAllWorkflowDivs;