From b23c7b04fbc9b597aef663af7f7c9b2780653196 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Mon, 5 Sep 2016 01:07:54 -0400
Subject: [PATCH 1/2] emscripten: add core switching

---
 pkg/emscripten/webplayer.html | 15 ++++++++++-----
 pkg/emscripten/webplayer.js   | 33 ++++++++++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/pkg/emscripten/webplayer.html b/pkg/emscripten/webplayer.html
index ee031694f8..3b9472207b 100644
--- a/pkg/emscripten/webplayer.html
+++ b/pkg/emscripten/webplayer.html
@@ -12,8 +12,14 @@
       <div class="container">
          <a class="navbar-brand" href="#">RetroArch</a>
          <ul class="nav navbar-nav">
-           <li class="nav-item active">
-               <a class="nav-link" href="#">Gambatte <span class="sr-only">(current)</span></a>
+           <li class="nav-item gambatte">
+               <a class="nav-link" href="webplayer.html?core=gambatte">Gambatte</a>
+            </li>
+           <li class="nav-item snes9x2010">
+               <a class="nav-link" href="webplayer.html?core=snes9x2010">Snex9x 2010</a>
+            </li>
+           <li class="nav-item vba_next">
+               <a class="nav-link vba_next" href="webplayer.html?core=vba_next">VBA Next</a>
             </li>
          </ul>
       </div>
@@ -28,7 +34,7 @@
    <div class="container">
       <div class="row">
          <div class="col-sm-12 form-group btn-group text-xs-center p-t-2" id="openrom">
-            <button class="btn btn-primary" id="btnStart" onclick="startRetroArch()">Start RetroArch</button>
+            <button class="btn btn-primary disabled" id="btnStart" onclick="startRetroArch()">Start RetroArch</button>
             <button class="btn btn-secondary" id="btnAuth" onclick="dropboxInit()">Sync DropBox</button>
             <button class="btn btn-secondary" id="btnLoad" disabled=true onclick="document.getElementById('rom').click()">Add Content</button>
             <input class="btn btn-secondary" style="display: none" type="file" id="rom" name="upload" onclick="document.getElementById('btnLoad').click();" onchange="selectFiles(event.target.files)" multiple />
@@ -46,10 +52,9 @@
 
    <script src="//code.jquery.com/jquery-3.1.0.min.js"></script>
    <script src="//cdnjs.cloudflare.com/ajax/libs/tether/1.3.4/js/tether.min.js"></script>
-   <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.3/js/bootstrap.min.js"></script>
+   <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.3/js/bootstrap.min.js"></script>
    <script src="//cdnjs.cloudflare.com/ajax/libs/dropbox.js/0.10.2/dropbox.min.js"></script>
    <script src="browserfs.js"></script>
    <script src="webplayer.js"></script>
-   <script src="gambatte_libretro.js"></script>
 </body>
 </html>
diff --git a/pkg/emscripten/webplayer.js b/pkg/emscripten/webplayer.js
index e26a6c9420..dec03abbfd 100644
--- a/pkg/emscripten/webplayer.js
+++ b/pkg/emscripten/webplayer.js
@@ -47,8 +47,8 @@ var showError = function(error) {
 function dropboxInit()
 {
   document.getElementById('btnStart').disabled = true;
-  document.getElementById('btnAuth').disabled = true;
-  client.authDriver(new Dropbox.AuthDriver.Redirect());
+  document.getElementById('btnAuth').disabled = true;
+  client.authDriver(new Dropbox.AuthDriver.Redirect());
   client.authenticate({ rememberUser: true }, function(error, client)
   {
      if (error) 
@@ -114,6 +114,15 @@ function setupFileSystem()
   }
 }
 
+/**
+ * Retrieve the value of the given GET parameter.
+ */
+function getParam(name) {
+  var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+  if (results) {
+    return results[1] || null;
+  }
+}
 
 function setupFolderStructure()
 {
@@ -140,7 +149,7 @@ function stat(path)
 function startRetroArch()
 {
   document.getElementById('canvas_div').style.display = 'block';
-  document.getElementById('btnLoad').disabled = false;
+  document.getElementById('btnLoad').disabled = false;
 
   setupFileSystem();
   setupFolderStructure();
@@ -205,3 +214,21 @@ var Module =
      this.totalDependencies = Math.max(this.totalDependencies, left);
   }
 };
+
+// When the browser has loaded everything.
+$(function() {
+  // Find which core to load.
+  var core = getParam('core');
+  if (!core) {
+    core = 'gambatte';
+  }
+
+  // Show the current core as the active core.
+  $('.nav-item.' + core).addClass('active');
+
+  // Load the Core's related JavaScript.
+  $.getScript(core + '_libretro.js', function () {
+    // Activate the Start RetroArch button.
+    $('#btnStart').removeClass('disabled');
+  });
+});

From d88e528fac8d363ef1de03daade2cc15db2d2026 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Mon, 5 Sep 2016 01:14:33 -0400
Subject: [PATCH 2/2] emscripten: rename webplayer.html to index.html

---
 pkg/emscripten/{webplayer.html => index.html} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename pkg/emscripten/{webplayer.html => index.html} (90%)

diff --git a/pkg/emscripten/webplayer.html b/pkg/emscripten/index.html
similarity index 90%
rename from pkg/emscripten/webplayer.html
rename to pkg/emscripten/index.html
index 3b9472207b..d3fcbec11d 100644
--- a/pkg/emscripten/webplayer.html
+++ b/pkg/emscripten/index.html
@@ -13,13 +13,13 @@
          <a class="navbar-brand" href="#">RetroArch</a>
          <ul class="nav navbar-nav">
            <li class="nav-item gambatte">
-               <a class="nav-link" href="webplayer.html?core=gambatte">Gambatte</a>
+               <a class="nav-link" href="./?core=gambatte">Gambatte</a>
             </li>
            <li class="nav-item snes9x2010">
-               <a class="nav-link" href="webplayer.html?core=snes9x2010">Snex9x 2010</a>
+               <a class="nav-link" href="./?core=snes9x2010">Snex9x 2010</a>
             </li>
            <li class="nav-item vba_next">
-               <a class="nav-link vba_next" href="webplayer.html?core=vba_next">VBA Next</a>
+               <a class="nav-link vba_next" href="./?core=vba_next">VBA Next</a>
             </li>
          </ul>
       </div>