From 3a501766ff063842acdf863731002f1fd4cdfd44 Mon Sep 17 00:00:00 2001
From: Nils Schneider <nils@nilsschneider.net>
Date: Sun, 29 Mar 2015 04:35:20 +0200
Subject: [PATCH] refactor main, app
---
app.js | 4 ++++
build.js | 2 +-
lib/main.js | 8 +++-----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app.js b/app.js
index cdf61bc..88f666b 100644
--- a/app.js
+++ b/app.js
@@ -18,3 +18,7 @@ require.config({
"helper": []
}
})
+
+require(["main", "helper"], function (main) {
+ main()
+})
diff --git a/build.js b/build.js
index 7666ee6..021929a 100644
--- a/build.js
+++ b/build.js
@@ -2,7 +2,7 @@
baseUrl: "lib",
name: "../bower_components/almond/almond",
mainConfigFile: "app.js",
- include: "main",
+ include: "../app",
wrap: true,
optimize: "uglify",
out: "app-combined.js"
diff --git a/lib/main.js b/lib/main.js
index 652c8b6..b66bccd 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,8 +1,6 @@
-require(["config", "moment", "chroma-js", "router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "nodelist", "simplenodelist", "infobox/main", "helper"],
-function (Config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, Nodelist, SimpleNodelist, Infobox) {
- main(Config)
-
- function main(config) {
+define(["config", "moment", "chroma-js", "router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "nodelist", "simplenodelist", "infobox/main"],
+function (config, moment, chroma, Router, Map, Sidebar, Tabs, Container, Meshstats, Linklist, Nodelist, SimpleNodelist, Infobox) {
+ return function () {
var linklist, lostnodeslist, map, meshstats, newnodeslist, nodelist, router
function createGUI() {
--
GitLab