diff --git a/app.js b/app.js index 22d04c7..8ae6bb1 100644 --- a/app.js +++ b/app.js @@ -8,7 +8,7 @@ require.config({ "moment": "../bower_components/moment/min/moment.min", "moment.de": "../bower_components/moment/locale/de", "tablesort": "../bower_components/tablesort/tablesort.min", - "tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric", + "tablesort.number": "../bower_components/tablesort/src/sorts/tablesort.number", "d3": "../bower_components/d3/d3.min", "numeral": "../bower_components/numeraljs/min/numeral.min", "numeral-intl": "../bower_components/numeraljs/min/languages.min", @@ -28,7 +28,7 @@ require.config({ deps: ["numeral"], exports: "numeral" }, - "tablesort.numeric": ["tablesort"], + "tablesort.number": ["tablesort"], "helper": ["numeral-intl"] } }); diff --git a/bower.json b/bower.json index e8d473a..e63962c 100644 --- a/bower.json +++ b/bower.json @@ -9,21 +9,20 @@ ], "dependencies": { "Leaflet.label": "~0.2.1", - "chroma-js": "~0.6.1", - "leaflet": "~0.7.3", - "moment": "~2.9.0", - "requirejs": "~2.1.16", - "tablesort": "https://github.com/tristen/tablesort.git#v3.0.2", + "chroma-js": "~1.1.1", + "leaflet": "~0.7.7", + "moment": "~2.13.0", + "requirejs": "~2.2.0", + "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1", "roboto-slab-fontface": "*", - "es6-shim": "~0.27.1", - "almond": "~0.3.1", - "r.js": "~2.1.16", - "d3": "~3.5.5", + "es6-shim": "~0.35.1", + "almond": "~0.3.2", + "d3": "~3.5.17", "numeraljs": "~1.5.3", "roboto-fontface": "~0.3.0", - "virtual-dom": "~2.0.1", - "leaflet-providers": "~1.0.27", - "rbush": "https://github.com/mourner/rbush.git#~1.3.5", + "virtual-dom": "~2.1.1", + "leaflet-providers": "~1.1.10", + "rbush": "https://github.com/mourner/rbush.git#~1.4.3", "jshashes": "~1.0.5" }, "authors": [ diff --git a/lib/gui.js b/lib/gui.js index 8379895..93ca0fd 100644 --- a/lib/gui.js +++ b/lib/gui.js @@ -10,7 +10,7 @@ define(["chroma-js", "map", "sidebar", "tabs", "container", "meshstats", var content; var contentDiv; - var linkScale = chroma.scale(chroma.interpolate.bezier(["#04C714", "#FF5500", "#F02311"])).domain([1, 5]); + var linkScale = chroma.scale(chroma.bezier(["#04C714", "#FF5500", "#F02311"])).domain([1, 5]); var sidebar; var buttons = document.createElement("div"); diff --git a/lib/infobox/node.js b/lib/infobox/node.js index 857f359..d4e8d4e 100644 --- a/lib/infobox/node.js +++ b/lib/infobox/node.js @@ -1,4 +1,4 @@ -define(["moment", "numeral", "tablesort", "tablesort.numeric", "moment.de"], +define(["moment", "numeral", "tablesort", "tablesort.number", "moment.de"], function (moment, numeral, Tablesort) { function showGeoURI(d) { function showLatitude(d) {