move all the main code into App.main

nedbat · Jul 31, 2021 · 65f5807 · 65f5807
1 parent 1c13c83
commit 65f5807
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 34 deletions.
diff --git a/src/aptus/web/static/aptus.js b/src/aptus/web/static/aptus.js
@@ -265,12 +265,38 @@ function fetch_post_json(url, body) {
 }
 
 const App = {
-    init() {
+    main() {
+        if (platform() === "mac") {
+            document.querySelector("html").classList.add("mac");
+        }
+
         this.view = Object.create(View).init(document.querySelector("#the_view"));
         this.reset();
         this.reset_dragging();
         this.resize_timeout = null;
-        return this;
+
+        on_event(document, "mousedown", ev => this.view_mousedown(ev), ".view.overlay");
+        on_event(document, "mousemove", ev => this.view_mousemove(ev));
+        on_event(document, "mouseup", ev => this.view_mouseup(ev));
+        on_event(document, "keydown", ev => this.keydown(ev));
+
+        on_event(document, "mousedown", ev => Panels.draggable_mousedown(ev), ".draggable");
+        on_event(document, "mousemove", ev => Panels.draggable_mousemove(ev));
+        on_event(document, "mouseup", ev => Panels.draggable_mouseup(ev));
+        on_event(".panel .closebtn", "click", ev => Panels.close_panel(ev));
+
+        on_event("#infopanel input", "change", ev => this.spec_change(ev));
+        on_event(window, "resize", ev => this.resize(ev));
+
+        on_event("#renderbutton", "click", ev => this.click_render(ev));
+
+        this.view.set_size();
+        this.view.paint();
+
+        setTimeout(
+            () => document.querySelector("#splash").classList.add("hidden"),
+            4000
+        );
     },
 
     reset() {
@@ -827,34 +853,3 @@ function checkers(canvas) {
         }
     }
 }
-
-function main() {
-    if (platform() === "mac") {
-        document.querySelector("html").classList.add("mac");
-    }
-
-    App.init();
-
-    on_event(document, "mousedown", ev => App.view_mousedown(ev), ".view.overlay");
-    on_event(document, "mousemove", ev => App.view_mousemove(ev));
-    on_event(document, "mouseup", ev => App.view_mouseup(ev));
-    on_event(document, "keydown", ev => App.keydown(ev));
-
-    on_event(document, "mousedown", ev => Panels.draggable_mousedown(ev), ".draggable");
-    on_event(document, "mousemove", ev => Panels.draggable_mousemove(ev));
-    on_event(document, "mouseup", ev => Panels.draggable_mouseup(ev));
-    on_event(".panel .closebtn", "click", ev => Panels.close_panel(ev));
-
-    on_event("#infopanel input", "change", ev => App.spec_change(ev));
-    on_event(window, "resize", ev => App.resize(ev));
-
-    on_event("#renderbutton", "click", ev => App.click_render(ev));
-
-    App.view.set_size();
-    App.view.paint();
-
-    setTimeout(
-        () => document.querySelector("#splash").classList.add("hidden"),
-        4000
-    );
-}
diff --git a/src/aptus/web/templates/mainpage.html b/src/aptus/web/templates/mainpage.html
@@ -112,6 +112,6 @@
     </div>
 
     <script>
-        document.body.onload = main;
+        document.body.onload = () => App.main();
     </script>
 </body>