From 0a7aaa7a0f9c156528621d03eaf97eaba5f71a67 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber_t@mailbox.org>
Date: Sun, 11 Oct 2020 00:32:22 -0500
Subject: [PATCH] Separate environment and runtime options

Having the dropdowns in one spot and the options for each of them in another spot is just weird and unnecessary
---
 index.html | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/index.html b/index.html
index 4bb27c9..a56a246 100644
--- a/index.html
+++ b/index.html
@@ -150,39 +150,25 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
     </section>
 
     <section class="hide-loading card">
-      <h2>Environment</h2>
+      <h2>Runtime</h2>
 
       <div>
         <label>
           Runtime
-          <select name="environment.runtime">
+          <select name="runtime.name">
             <option value="turbowarp">TurboWarp</option>
             <option value="forkphorus">forkphorus</option>
           </select>
         </label>
       </div>
 
-      <div>
-        <label>
-          Target Environment
-          <select name="environment.target">
-            <option value="html">Plain HTML (Standalone)</option>
-            <option value="zip">Zip</option>
-            <option value="nwjs-win64">NW.js (Windows x64)</option>
-            <option value="nwjs-mac">NW.js (Mac)</option>
-          </select>
-        </label>
-      </div>
-    </section>
-
-    <section class="hide-loading card">
-      <div if="O.environment.runtime === 'turbowarp'" class="fold">
+      <div if="O.runtime.name === 'turbowarp'" class="fold">
         <h2>TurboWarp options</h2>
   
         <p>TurboWarp currently does not support any options.</p>
       </div>
 
-      <div if="O.environment.runtime === 'forkphorus'" class="fold">
+      <div if="O.runtime.name === 'forkphorus'" class="fold">
         <h2>forkphorus options</h2>
 
         <div>
@@ -245,17 +231,31 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
     </section>
 
     <section class="hide-loading card">
-      <div if="O.environment.target === 'html'" class="fold">
+      <h2>Environment</h2>
+
+      <div>
+        <label>
+          Environment
+          <select name="environment.name">
+            <option value="html">Plain HTML (Standalone)</option>
+            <option value="zip">Zip</option>
+            <option value="nwjs-win64">NW.js (Windows x64)</option>
+            <option value="nwjs-mac">NW.js (Mac)</option>
+          </select>
+        </label>
+      </div>
+
+      <div if="O.environment.name === 'html'" class="fold">
         <h2>Plain HTML Options</h2>
         <p>No options.</p>
       </div>
 
-      <div if="O.environment.target === 'zip'" class="fold">
+      <div if="O.environment.name === 'zip'" class="fold">
         <h2>Zip Options</h2>
         <p>No options.</p>
       </div>
 
-      <div if="O.environment.target.startsWith('nw')" class="fold">
+      <div if="O.environment.name.startsWith('nw')" class="fold">
         <h2>NW.js Options</h2>
 
         <div>
@@ -362,7 +362,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
         };
   
         const getRuntime = async (projectType) => {
-          switch (O.environment.runtime) {
+          switch (O.runtime.name) {
             case 'turbowarp': return new Packager.runtimes.TurboWarp();
             case 'forkphorus': return new Packager.runtimes.Forkphorus({
               playerOptions: {
@@ -382,7 +382,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
           .then((r) => r.blob());
   
         const getEnvironment = async () => {
-          switch (O.environment.target) {
+          switch (O.environment.name) {
             case 'html': return new Packager.environments.HTML();
             case 'zip': return new Packager.environments.Zip();
             case 'nwjs-win64':
@@ -390,7 +390,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
               return new Packager.environments.NWjs({
                 icon: O.nwjs.icon || await getDefaultIcon(),
                 manifest: O.nwjs.manifest,
-                platform: O.environment.target.substr('nwjs-'.length),
+                platform: O.environment.name.substr('nwjs-'.length),
               });
           }
           throw new Error('unknown environment');