Freifunk-Troisdorf/meshviewer
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TASK] Update to moment.js 2.17 & several small bugfix updates

Browse Source
This commit is contained in:
Xaver Maierhofer 2016-12-26 03:44:59 +01:00
parent 7e9470a698
commit bcd126464f
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -6,8 +6,7 @@ require.config({
"leaflet": "../bower_components/leaflet/dist/leaflet", "leaflet": "../bower_components/leaflet/dist/leaflet",
"leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label", "leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label",
"chroma-js": "../bower_components/chroma-js/chroma.min", "chroma-js": "../bower_components/chroma-js/chroma.min",
"moment": "../bower_components/moment/min/moment.min", "moment": "../bower_components/moment",
"moment.de": "../bower_components/moment/locale/de",
"tablesort": "../bower_components/tablesort/src/tablesort", "tablesort": "../bower_components/tablesort/src/tablesort",
"d3": "../bower_components/d3/d3.min", "d3": "../bower_components/d3/d3.min",
"virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom", "virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom",
@ -16,7 +15,6 @@ require.config({
}, },
shim: { shim: {
"leaflet.label": ["leaflet"], "leaflet.label": ["leaflet"],
"moment.de": ["moment"],
"tablesort": { "tablesort": {
exports: "Tablesort" exports: "Tablesort"
} }

8
bower.json
View File

@ -11,11 +11,11 @@
"Leaflet.label": "~0.2.1", "Leaflet.label": "~0.2.1",
"chroma-js": "~1.1.1", "chroma-js": "~1.1.1",
"leaflet": "https://github.com/davojta/Leaflet.git#v0.7.7.1", "leaflet": "https://github.com/davojta/Leaflet.git#v0.7.7.1",
"moment": "~2.13.0", "moment": "~2.17.1",
"requirejs": "~2.3.1", "requirejs": "~2.3.2",
"tablesort": "https://github.com/tristen/tablesort.git#v4.0.1", "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1",
"es6-shim": "~0.35.1", "es6-shim": "~0.35.2",
"almond": "~0.3.2", "almond": "~0.3.3",
"d3": "~3.5.17", "d3": "~3.5.17",
"virtual-dom": "~2.1.1", "virtual-dom": "~2.1.1",
"rbush": "https://github.com/mourner/rbush.git#~1.4.3" "rbush": "https://github.com/mourner/rbush.git#~1.4.3"

2
lib/infobox/node.js
View File

@ -1,4 +1,4 @@
define(["chroma-js", "moment", "tablesort", "helper", "moment.de"], define(["chroma-js", "moment/moment", "tablesort", "helper", "moment/locale/de"],
function (chroma, moment, Tablesort, helper) { function (chroma, moment, Tablesort, helper) {
"use strict"; "use strict";

2
lib/main.js
View File

@ -1,4 +1,4 @@
define(["moment", "router", "leaflet", "gui", "helper", "moment.de"], define(["moment/moment", "router", "leaflet", "gui", "helper", "moment/locale/de"],
function (moment, Router, L, GUI, helper) { function (moment, Router, L, GUI, helper) {
"use strict"; "use strict";

4
lib/map.js
View File

@ -1,6 +1,6 @@
define(["map/clientlayer", "map/labelslayer", define(["map/clientlayer", "map/labelslayer",
"leaflet", "moment", "locationmarker", "rbush", "helper", "leaflet", "moment/moment", "locationmarker", "rbush", "helper",
"leaflet.label", "moment.de"], "leaflet.label", "moment/locale/de"],
function (ClientLayer, LabelsLayer, L, moment, LocationMarker, rbush, helper) { function (ClientLayer, LabelsLayer, L, moment, LocationMarker, rbush, helper) {
"use strict"; "use strict";

2
lib/simplenodelist.js
View File

@ -1,4 +1,4 @@
define(["moment", "virtual-dom", "helper", "moment.de"], function (moment, V, helper) { define(["moment/moment", "virtual-dom", "helper", "moment/locale/de"], function (moment, V, helper) {
"use strict"; "use strict";
return function (nodes, field, router, title) { return function (nodes, field, router, title) {

8
package.json
View File

@ -12,8 +12,8 @@
"test": "node -e \"require('grunt').cli()\" '' clean lint" "test": "node -e \"require('grunt').cli()\" '' clean lint"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.5.1", "autoprefixer": "^6.6.0",
"eslint": "^3.9.1", "eslint": "^3.12.2",
"eslint-config-defaults": "^9.0.0", "eslint-config-defaults": "^9.0.0",
"grunt": "^1.0.1", "grunt": "^1.0.1",
"grunt-bower-install-simple": "^1.2.3", "grunt-bower-install-simple": "^1.2.3",
@ -29,8 +29,8 @@
"grunt-inline": "^0.3.6", "grunt-inline": "^0.3.6",
"grunt-inline-data": "git://github.com/xiaokaike/grunt-inline-data.git#2eeb08f", "grunt-inline-data": "git://github.com/xiaokaike/grunt-inline-data.git#2eeb08f",
"grunt-postcss": "^0.8.0", "grunt-postcss": "^0.8.0",
"grunt-sass": "^1.2.1", "grunt-sass": "^2.0.0",
"grunt-sass-lint": "^0.2.0" "grunt-sass-lint": "^0.2.2"
}, },
"eslintConfig": { "eslintConfig": {
"env": { "env": {