Merge remote-tracking branch 'upstream/master' into slideshow-zoom

package.json

@@ -18,6 +18,9 @@
     "cssnano": "^4.1.10",
     "del": "^5.1.0",
     "eslint": "^6.8.0",
+    "eslint-plugin-eslint-comments": "^3.1.2",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-promise": "^4.2.1",
     "file-loader": "^6.0.0",
     "gulp": "^4.0.2",
     "gulp-babel": "^8.0.0",
@@ -53,6 +56,7 @@
     "alameda": "^1.4.0",
     "classlist.js": "https://github.com/eligrey/classList.js/archive/1.2.20180112.tar.gz",
     "core-js": "^3.6.4",
+    "date-fns": "^2.11.1",
     "document-register-element": "^1.14.3",
     "flv.js": "^1.5.0",
     "hls.js": "^0.13.1",
@@ -87,7 +91,8 @@
           "src/components/input/keyboardnavigation.js",
           "src/components/sanatizefilename.js",
           "src/scripts/settings/webSettings.js",
-          "src/components/scrollManager.js"
+          "src/components/scrollManager.js",
+          "src/scripts/dfnshelper.js"
         ],
         "plugins": [
           "@babel/plugin-transform-modules-amd"