move config.js to config.json, load by XHR

This commit is contained in:
Nils Schneider 2015-07-19 19:45:25 +02:00
parent 848b5b7384
commit 102c8af873
4 changed files with 15 additions and 15 deletions

View file

@ -37,9 +37,17 @@ Execute these commands on your server as a normal user to prepare the dependenci
npm install bower grunt-cli npm install bower grunt-cli
node_modules/.bin/bower install node_modules/.bin/bower install
# Building
Just run the following command from the meshviewer directory:
node_modules/.bin/grunt
This will generate `build/` containing all required files.
# Configure # Configure
Copy `config.js.example` to `config.js` and change it to match your community. Copy `config.json.example` to `build/config.json` and change it to match your community.
## dataPath (string) ## dataPath (string)
@ -133,12 +141,4 @@ Examples for `globalInfos`:
In order to have global statistics available, you have to run the backend with parameter `--with-rrd` (this only creates globalGraph.png) or generate them in other ways. In order to have global statistics available, you have to run the backend with parameter `--with-rrd` (this only creates globalGraph.png) or generate them in other ways.
# Building
Just run the following command from the meshviewer directory:
node_modules/.bin/grunt
This will generate `build/` containing all required files.
[CORS enabled]: http://enable-cors.org/server.html [CORS enabled]: http://enable-cors.org/server.html

2
app.js
View file

@ -32,5 +32,5 @@ require.config({
}) })
require(["main", "helper"], function (main) { require(["main", "helper"], function (main) {
main() getJSON("config.json").then(main)
}) })

View file

@ -1,4 +1,4 @@
define({ {
"dataPath": "https://map.luebeck.freifunk.net/data/", "dataPath": "https://map.luebeck.freifunk.net/data/",
"siteName": "Freifunk Lübeck", "siteName": "Freifunk Lübeck",
"mapSigmaScale": 0.5, "mapSigmaScale": 0.5,
@ -18,4 +18,4 @@ define({
"name": "Stamen.TonerLite" "name": "Stamen.TonerLite"
} }
] ]
}) }

View file

@ -1,6 +1,6 @@
define(["../config", "moment", "router", "leaflet", "gui", "numeral"], define(["moment", "router", "leaflet", "gui", "numeral"],
function (config, moment, Router, L, GUI, numeral) { function (moment, Router, L, GUI, numeral) {
return function () { return function (config) {
function handleData(data) { function handleData(data) {
var dataNodes = data[0] var dataNodes = data[0]
var dataGraph = data[1] var dataGraph = data[1]