fix how.html

greggman · greggman · commit d06b9f3078a8 · 2015-10-01T21:01:48.000+02:00
diff --git a/public/games.html b/public/games.html
@@ -97,6 +97,21 @@ <h2><a href="http://superhappyfuntimes.net">visit superhappyfuntimes.net for mor
     </div>
   </div>
 </div>
+<div class="unhidden-msg" style="display:none;">
+  <div>
+    <div>
+      <p>How To Play</p>
+      <p>
+      All players must connect their phones to <span class="strong">
+      the same WiFi</span> as this computer then go to
+      <span class="strong">happyfuntimes.net</span>
+      </p>
+      <blockquote>
+        <div class="button-like">Got It!</div>
+      </blockquote>
+    </div>
+  </div>
+</div>
 <div id="disconnected" class="hft-hidden">
   <div class="hft-fullscreencenter">
      <div>Disconnected<br/>(please re-start HappyFunTimes)</div>
diff --git a/public/how.html b/public/how.html
@@ -34,52 +34,11 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0, maximum-scale=1, user-scalable=no, minimal-ui">
   <title>HappyFunTimes</title>
-  <link rel="stylesheet" href="css/menu.css">
-  <style>
-  </style>
 </head>
 <body>
-<div id="hft-icons">
-    <div class="hft-icon"><a href="how.html"><img src="/hft/assets/question-icon.svg"></a></div>
-    <div class="hft-icon"><a href="options.html"><img src="/hft/assets/gear-icon.svg"></a></div>
-    <div class="hft-icon" id="quit"><img src="/hft/assets/power-icon.svg"></div>
-</div>
-<h1><span id="versionnum"></span><span>HappyFunTimes<span id="version">super-alpha</span></span></h1>
-<div class="unhidden-msg" target="games.html">
-  <div>
-    <div>
-      <p>How To Play</p>
-      <p>
-      All players must connect their phones to <span class="strong">
-      the same WiFi</span> as this computer then go to
-      <span class="strong">happyfuntimes.net</span>
-      </p>
-      <blockquote>
-        <div class="button-like">Got It!</div>
-      </blockquote>
-    </div>
-  </div>
-</div>
-<div id="disconnected" class="hft-hidden">
-  <div class="hft-fullscreencenter">
-     <div>Disconnected<br/>(please re-start HappyFunTimes)</div>
-  </div>
-</div>
-<div id="exited" class="hft-hidden">
-  <div class="hft-fullscreencenter">
-    <div>Exited<br/>(over and out!)<br/><a href="http://superhappyfuntimes.net">SuperHappyFunTimes</a></div>
-  </div>
-</div>
-</body>
-<script data-main="scripts/showavailablegames.js" src="3rdparty/require.js"></script>
 <script>
-requirejs.config({
-  paths: {
-    hft: '/hft/0.x.x/scripts',
-  },
-});
+window.location.href = "games.html?settings={how:true}";
 </script>
 </html>
 
diff --git a/public/scripts/showavailablegames.js b/public/scripts/showavailablegames.js
@@ -55,6 +55,7 @@ requirejs(
     gamesById: {},
     hftData: {},
   };
+  misc.applyUrlSettings(g);
 
   g.dd = new DragDropManager({
     inputElem: document.body,
@@ -426,9 +427,11 @@ requirejs(
 
   (function() {
     var elem = document.querySelector(".unhidden-msg");
-    if (elem) {
+    if (elem && g.how) {
+      window.history.replaceState({}, "", window.location.origin + window.location.pathname);
+      elem.style.display = "block";
       elem.addEventListener('click', function() {
-        window.location.href = elem.getAttribute("target");
+        elem.style.display = "none";
       }, false);
     }
   }());
