From bcd126464f505fa61d2390394ff1642761d734e2 Mon Sep 17 00:00:00 2001
From: Xaver Maierhofer <xaver.maierhofer@xwissen.info>
Date: Mon, 26 Dec 2016 03:44:59 +0100
Subject: [PATCH] [TASK] Update to moment.js 2.17 & several small bugfix
 updates

---
 app.js                | 4 +---
 bower.json            | 8 ++++----
 lib/infobox/node.js   | 2 +-
 lib/main.js           | 2 +-
 lib/map.js            | 4 ++--
 lib/simplenodelist.js | 2 +-
 package.json          | 8 ++++----
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index 4fcc596..23169bd 100644
--- a/app.js
+++ b/app.js
@@ -6,8 +6,7 @@ require.config({
     "leaflet": "../bower_components/leaflet/dist/leaflet",
     "leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label",
     "chroma-js": "../bower_components/chroma-js/chroma.min",
-    "moment": "../bower_components/moment/min/moment.min",
-    "moment.de": "../bower_components/moment/locale/de",
+    "moment": "../bower_components/moment",
     "tablesort": "../bower_components/tablesort/src/tablesort",
     "d3": "../bower_components/d3/d3.min",
     "virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom",
@@ -16,7 +15,6 @@ require.config({
   },
   shim: {
     "leaflet.label": ["leaflet"],
-    "moment.de": ["moment"],
     "tablesort": {
       exports: "Tablesort"
     }
diff --git a/bower.json b/bower.json
index 7be1e0a..f00bbe5 100644
--- a/bower.json
+++ b/bower.json
@@ -11,11 +11,11 @@
     "Leaflet.label": "~0.2.1",
     "chroma-js": "~1.1.1",
     "leaflet": "https://github.com/davojta/Leaflet.git#v0.7.7.1",
-    "moment": "~2.13.0",
-    "requirejs": "~2.3.1",
+    "moment": "~2.17.1",
+    "requirejs": "~2.3.2",
     "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1",
-    "es6-shim": "~0.35.1",
-    "almond": "~0.3.2",
+    "es6-shim": "~0.35.2",
+    "almond": "~0.3.3",
     "d3": "~3.5.17",
     "virtual-dom": "~2.1.1",
     "rbush": "https://github.com/mourner/rbush.git#~1.4.3"
diff --git a/lib/infobox/node.js b/lib/infobox/node.js
index 4ead611..337ca41 100644
--- a/lib/infobox/node.js
+++ b/lib/infobox/node.js
@@ -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) {
     "use strict";
 
diff --git a/lib/main.js b/lib/main.js
index fb319b7..60846d1 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -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) {
     "use strict";
 
diff --git a/lib/map.js b/lib/map.js
index da4a555..5be38ec 100644
--- a/lib/map.js
+++ b/lib/map.js
@@ -1,6 +1,6 @@
 define(["map/clientlayer", "map/labelslayer",
-    "leaflet", "moment", "locationmarker", "rbush", "helper",
-    "leaflet.label", "moment.de"],
+    "leaflet", "moment/moment", "locationmarker", "rbush", "helper",
+    "leaflet.label", "moment/locale/de"],
   function (ClientLayer, LabelsLayer, L, moment, LocationMarker, rbush, helper) {
     "use strict";
 
diff --git a/lib/simplenodelist.js b/lib/simplenodelist.js
index da857eb..528fae4 100644
--- a/lib/simplenodelist.js
+++ b/lib/simplenodelist.js
@@ -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";
 
   return function (nodes, field, router, title) {
diff --git a/package.json b/package.json
index 4dbfec2..2a45f36 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "test": "node -e \"require('grunt').cli()\" '' clean lint"
   },
   "devDependencies": {
-    "autoprefixer": "^6.5.1",
-    "eslint": "^3.9.1",
+    "autoprefixer": "^6.6.0",
+    "eslint": "^3.12.2",
     "eslint-config-defaults": "^9.0.0",
     "grunt": "^1.0.1",
     "grunt-bower-install-simple": "^1.2.3",
@@ -29,8 +29,8 @@
     "grunt-inline": "^0.3.6",
     "grunt-inline-data": "git://github.com/xiaokaike/grunt-inline-data.git#2eeb08f",
     "grunt-postcss": "^0.8.0",
-    "grunt-sass": "^1.2.1",
-    "grunt-sass-lint": "^0.2.0"
+    "grunt-sass": "^2.0.0",
+    "grunt-sass-lint": "^0.2.2"
   },
   "eslintConfig": {
     "env": {