Formatting after JavaScript changes from last night.

google · Jun 9, 2020 · 5247ea9 · 5247ea9
1 parent 40d99f5
commit 5247ea9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/format.sh b/format.sh
@@ -42,7 +42,6 @@ function format_hs {
     rm "$tmpfile"
 }
 
-run . cabal_install ormolu-0.0.2.0
 function formatall_hs {
     for f in $(find */src -regex .*\\.hs$ -type f)
     do

diff --git a/web/css/runner.css b/web/css/runner.css
@@ -7,6 +7,4 @@
     cursor: default;
     width: 100vw;
     height: 100vh;
-    /* max-height: 100vh; */
-    /* max-width: 100vh; */
 }
diff --git a/web/js/run.js b/web/js/run.js
@@ -214,34 +214,33 @@ function start() {
 
 function init() {
     let paramList = location.search.slice(1).split('&');
-    let params = {};
+    const params = {};
     for (let i = 0; i < paramList.length; i++) {
-        let name = decodeURIComponent(paramList[i].split('=')[0]);
-        let value = decodeURIComponent(paramList[i].slice(name.length + 1));
+        const name = decodeURIComponent(paramList[i].split('=')[0]);
+        const value = decodeURIComponent(paramList[i].slice(name.length + 1));
         params[name] = value;
     }
     // params from the hash
     paramList = location.hash.slice(1).split('&');
     for (let i = 0; i < paramList.length; i++) {
-        let name = decodeURIComponent(paramList[i].split('=')[0]);
-        let value = decodeURIComponent(paramList[i].slice(name.length + 1));
+        const name = decodeURIComponent(paramList[i].split('=')[0]);
+        const value = decodeURIComponent(paramList[i].slice(name.length + 1));
         params[name] = value;
     }
 
-    let hash = params['hash'];
-    let dhash = params['dhash'];
+    const hash = params['hash'];
+    const dhash = params['dhash'];
     let mode = params['mode'];
 
-    let gid = params['gid'];
     if (!mode) mode = 'codeworld';
 
-    let query = '?mode=' + encodeURIComponent(mode);
-    if (hash) query += '&hash=' + encodeURIComponent(hash);
-    if (dhash) query += '&dhash=' + encodeURIComponent(dhash);
+    let query = `?mode=${encodeURIComponent(mode)}`;
+    if (hash) query += `&hash=${encodeURIComponent(hash)}`;
+    if (dhash) query += `&dhash=${encodeURIComponent(dhash)}`;
 
-    let uri = 'runJS' + query;
+    const uri = `runJS${query}`;
 
-    let loadScript = document.createElement('script');
+    const loadScript = document.createElement('script');
     loadScript.setAttribute('type', 'text/javascript');
     loadScript.setAttribute('src', uri);
     document.body.appendChild(loadScript);

diff --git a/web/run.html b/web/run.html
@@ -4,7 +4,6 @@
 
 <head>
     <title>CodeWorld</title>
-    <link rel="stylesheet" type="text/css" href="css/theme-variables.css">
     <link rel="stylesheet" type="text/css" href="css/runner.css">
 </head>
 
@@ -13,6 +12,8 @@
 </body>
 <script type="text/javascript" src="js/run.js"></script>
 <script type="text/javascript" src="js/debugmode.js"></script>
-<script type="text/javascript">init();</script>
+<script type="text/javascript">
+    init();
+</script>
 
 </html>