From 056c46331d916f278ec8587c3524bfa70384161a Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Sun, 29 Mar 2015 04:26:23 +0200 Subject: [PATCH] load helper.js using requirejs --- app.js | 8 ++++---- index.html | 1 - lib/main.js | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app.js b/app.js index 1d60bea..cdf61bc 100644 --- a/app.js +++ b/app.js @@ -6,15 +6,15 @@ require.config({ "chroma-js": "../bower_components/chroma-js/chroma.min", "moment": "../bower_components/moment/min/moment-with-locales.min", "tablesort": "../bower_components/tablesort/tablesort.min", - "tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric" + "tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric", + "helper": "../helper" }, shim: { "leaflet.label": ["leaflet"], "tablesort": { exports: "Tablesort" }, - "tablesort.numeric": ["tablesort"] + "tablesort.numeric": ["tablesort"], + "helper": [] } }) - -require(["main"]) diff --git a/index.html b/index.html index 464ada1..932eb3a 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,6 @@ - diff --git a/lib/main.js b/lib/main.js index 46f38fb..652c8b6 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,4 +1,4 @@ -require(["config", "moment", "chroma-js", "router", "map", "sidebar", "tabs", "container", "meshstats", "linklist", "nodelist", "simplenodelist", "infobox/main"], +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)