Merge branch 'v0.30.4'

ivmartel · Dec 10, 2021 · 93523d2 · 93523d2
2 parents b115a80 + 1810a5f
commit 93523d2
Show file tree

Hide file tree

Showing 18 changed files with 113 additions and 76 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [v0.30.4](https://github.com/ivmartel/dwv/releases/tag/v0.30.4) - 10/12/2021
+
+### Fixed
+
+- Load i18next plugins as modules [#1057](https://github.com/ivmartel/dwv/issues/1057)
+- Update overlays after event data change [#1056](https://github.com/ivmartel/dwv/issues/1056)
+
+### Dependencies
+
+- Replace i18next-xhr-backend with i18next-http-backend [#1049](https://github.com/ivmartel/dwv/issues/1049)
+
+---
+
 ## [v0.30.3](https://github.com/ivmartel/dwv/releases/tag/v0.30.3) - 09/12/2021
 
 ### Fixed

diff --git a/dist/dwv.js b/dist/dwv.js
@@ -1,12 +1,12 @@
-/*! dwv 0.30.3 2021-12-09 16:13:34 */
+/*! dwv 0.30.4 2021-12-10 19:20:41 */
 // Inspired from umdjs
 // See https://github.com/umdjs/umd/blob/master/templates/returnExports.js
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
         define([
             'i18next',
-            'i18next-xhr-backend',
+            'i18next-http-backend',
             'i18next-browser-languagedetector',
             'jszip',
             'konva',
@@ -17,11 +17,10 @@
         // only CommonJS-like environments that support module.exports,
         // like Node.
 
-        // i18next-xhr-backend: requires XMlHttpRequest
         // Konva: requires 'canvas'
         module.exports = factory(
             require('i18next'),
-            require('i18next-xhr-backend'),
+            require('i18next-http-backend'),
             require('i18next-browser-languagedetector'),
             require('jszip'),
             require('konva/cmj'),
@@ -31,7 +30,7 @@
         // Browser globals (root is window)
         root.dwv = factory(
             root.i18next,
-            root.i18nextXHRBackend,
+            root.i18nextHttpBackend,
             root.i18nextBrowserLanguageDetector,
             root.JSZip,
             root.Konva,
@@ -40,7 +39,7 @@
     }
 }(this, function (
     i18next,
-    i18nextXHRBackend,
+    i18nextHttpBackend,
     i18nextBrowserLanguageDetector,
     JSZip,
     Konva,
@@ -49,20 +48,27 @@
     // similar to what browserify does but reversed
     // https://www.contentful.com/blog/2017/01/17/the-global-object-in-javascript/
     var window = typeof window !== 'undefined' ?
-        window : typeof self !== 'undefined' ?
-        self : typeof global !== 'undefined' ?
-        global : {};
-
-    // latest i18next (>v17) does not export default
-    // see #862 and https://github.com/i18next/i18next/commit/7c6c235
-    if (typeof i18next !== 'undefined' &&
-      typeof i18next.t === 'undefined') {
+      window : typeof self !== 'undefined' ?
+      self : typeof global !== 'undefined' ?
+      global : {};
+
+    // if it has a default, treat it as ESM
+    var isEsmModule = function (mod) {
+      return typeof mod !== 'undefined' &&
+        typeof mod.default !== 'undefined';
+    }
+    // i18next (>v17) comes as a module, see #862
+    if (isEsmModule(i18next)) {
       i18next = i18next.default;
     }
-
+    if (isEsmModule(i18nextHttpBackend)) {
+      i18nextHttpBackend = i18nextHttpBackend.default;
+    }
+    if (isEsmModule(i18nextBrowserLanguageDetector)) {
+      i18nextBrowserLanguageDetector = i18nextBrowserLanguageDetector.default;
+    }
     // Konva (>=v8) comes as a module, see #1044
-    if (typeof Konva !== 'undefined' &&
-      typeof Konva.Group === 'undefined') {
+    if (isEsmModule(Konva)) {
       Konva = Konva.default;
     }
 
@@ -4398,7 +4404,7 @@ dwv.dicom = dwv.dicom || {};
  * @returns {string} The version of the library.
  */
 dwv.getVersion = function () {
-  return '0.30.3';
+  return '0.30.4';
 };
 
 /**
@@ -32351,12 +32357,12 @@ var dwv = dwv || {};
  */
 var i18next = i18next || {};
 /**
- * The i18nextXHRBackend namespace.
+ * The i18nextHttpBackend namespace.
  *
- * @external i18nextXHRBackend
- * @see https://github.com/i18next/i18next-xhr-backend
+ * @external i18nextHttpBackend
+ * @see https://github.com/i18next/i18next-http-backend
  */
-var i18nextXHRBackend = i18nextXHRBackend || {};
+var i18nextHttpBackend = i18nextHttpBackend || {};
 /**
  * The i18nextBrowserLanguageDetector namespace.
  *
@@ -32390,8 +32396,8 @@ dwv.i18nInitialise = function (language, localesPath) {
     load: 'languageOnly',
     backend: {loadPath: lpath + '/locales/{{lng}}/{{ns}}.json'}
   };
-    // use the XHR backend to get translation files
-  var i18n = i18next.use(i18nextXHRBackend);
+    // use the HTTP backend to get translation files
+  var i18n = i18next.use(i18nextHttpBackend);
   // use browser language or the specified one
   if (lng === 'auto') {
     i18n.use(i18nextBrowserLanguageDetector);

diff --git a/dist/dwv.min.js b/dist/dwv.min.js
diff --git a/karma.conf.js b/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function (config) {
       {pattern: 'node_modules/konva/konva.min.js', watched: false},
       {pattern: 'node_modules/i18next/i18next.min.js', watched: false},
       {
-        pattern: 'node_modules/i18next-xhr-backend/i18nextXHRBackend.min.js',
+        pattern: 'node_modules/i18next-http-backend/i18nextHttpBackend.min.js',
         watched: false
       },
       {

diff --git a/locales/de/overlays.json b/locales/de/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Grauwert: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Grauwert: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Grauwert: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Grauwert: {v2}"}
     ]
 }
diff --git a/locales/en/overlays.json b/locales/en/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -31,7 +31,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v3}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
     ],
     "*": [
         {"tags": ["x00100020"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ]
 }
diff --git a/locales/es/overlays.json b/locales/es/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ]
 }
diff --git a/locales/fr/overlays.json b/locales/fr/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Valeur: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Valeur: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Valeur: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Valeur: {v2}"}
     ]
 }
diff --git a/locales/it/overlays.json b/locales/it/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Valore: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Valore: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Valore: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Valore: {v2}"}
     ]
 }
diff --git a/locales/jp/overlays.json b/locales/jp/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ]
 }
diff --git a/locales/ro/overlays.json b/locales/ro/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Value: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Value: {v2}"}
     ]
 }
diff --git a/locales/ru/overlays.json b/locales/ru/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Значение: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Значение: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "Pos: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "Значение: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "Значение: {v2}"}
     ]
 }
diff --git a/locales/zh/overlays.json b/locales/zh/overlays.json
@@ -17,7 +17,7 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "位置: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "值: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "值: {v2}"}
     ],
     "DOM": [
         {"tags": ["fileName"], "pos": "tl"},
@@ -54,6 +54,6 @@
         {"value": "zoomchange", "pos": "br", "format": "Z: {v0}", "precision": "3"},
         {"value": "offsetchange", "pos": "br", "format": "Off: {v0},{v1}", "precision": "round"},
         {"value": "positionchange", "pos": "br", "format": "位置: {v0}"},
-        {"value": "positionchange", "pos": "br", "format": "值: {v1}"}
+        {"value": "positionchange", "pos": "br", "format": "值: {v2}"}
     ]
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dwv",
-  "version": "0.30.3",
+  "version": "0.30.4",
   "description": "DICOM Web Viewer.",
   "keywords": [
     "DICOM",
@@ -24,7 +24,7 @@
   "dependencies": {
     "i18next": "~20.6.0",
     "i18next-browser-languagedetector": "~6.1.2",
-    "i18next-xhr-backend": "~3.2.2",
+    "i18next-http-backend": "~1.3.1",
     "jszip": "~3.7.0",
     "konva": "~8.3.0",
     "magic-wand-tool": "~1.1.7"