Mercurial > hg > orthanc-stone

changeset 2148:82b8f1a3dafd dicom-sr

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->dicom-sr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 30 Aug 2024 18:51:21 +0200
parents 743fa9c74443 (current diff) bea4e7900a47 (diff)
children f68f9a8d0d63
files
diffstat 4 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Aug 16 18:09:53 2024 +0200
+++ b/.hgignore	Fri Aug 30 18:51:21 2024 +0200
@@ -21,6 +21,7 @@
 Applications/Samples/Deprecated/WebAssembly/build/
 Applications/Samples/Deprecated/WebAssembly/ThirdPartyDownloads/
 Applications/Samples/Deprecated/WebAssembly/installDir/
+Applications/StoneWebViewer/WebAssembly/Build/
 StoneWebViewer/Plugin/ThirdPartyDownloads/
 StoneWebViewer/Resources/package-lock.json
 StoneWebViewer/WebAssembly/ThirdPartyDownloads/
--- a/Applications/StoneWebViewer/NEWS	Fri Aug 16 18:09:53 2024 +0200
+++ b/Applications/StoneWebViewer/NEWS	Fri Aug 30 18:51:21 2024 +0200
@@ -10,6 +10,8 @@
 * Open the first loaded series only if it is part of a selected study
 * Fix default windowing for images without preset windowing
 * Upgraded Emscripten version to 3.1.49
+* Upgraded jquery to 3.7.1
+* Upgraded axios to 1.7.5
 
 
 Version 2.5 (2022-12-05)
--- a/Applications/StoneWebViewer/WebApplication/index.html	Fri Aug 16 18:09:53 2024 +0200
+++ b/Applications/StoneWebViewer/WebApplication/index.html	Fri Aug 30 18:51:21 2024 +0200
@@ -927,7 +927,7 @@
         </div>
       </div>
     </script>
-    <script src="js/jquery-3.4.1.min.js"></script>
+    <script src="js/jquery-3.7.1.min.js"></script>
     <script src="js/bootstrap.min.js"></script>
     <script src="js/vue.min.js"></script>
     <script src="js/axios.min.js"></script>
--- a/Applications/StoneWebViewer/WebAssembly/JavaScriptLibraries.cmake	Fri Aug 16 18:09:53 2024 +0200
+++ b/Applications/StoneWebViewer/WebAssembly/JavaScriptLibraries.cmake	Fri Aug 30 18:51:21 2024 +0200
@@ -36,13 +36,13 @@
   "${CMAKE_CURRENT_BINARY_DIR}/vue-2.6.14")
 
 DownloadPackage(
-  "3e2b4e1522661f7fcf8ad49cb933296c"
-  "${BASE_URL}/dicom-web/axios-0.19.0.tar.gz"
-  "${CMAKE_CURRENT_BINARY_DIR}/axios-0.19.0")
+  "93082a766ebf2748aba038aeb32d8a06"
+  "${BASE_URL}/dicom-web/axios-1.7.5.tar.gz"
+  "${CMAKE_CURRENT_BINARY_DIR}/axios-1.7.5")
 
 DownloadFile(
-  "220afd743d9e9643852e31a135a9f3ae"
-  "${BASE_URL}/jquery-3.4.1.min.js")
+  "2c872dbe60f4ba70fb85356113d8b35e"
+  "${BASE_URL}/jquery-3.7.1.min.js")
 
 if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/pdfjs)
   DownloadPackage(
@@ -68,10 +68,10 @@
 install(
   FILES
   ${CMAKE_CURRENT_BINARY_DIR}/bootstrap-3.4.1-dist/js/bootstrap.min.js
-  ${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/jquery-3.4.1.min.js
+  ${CMAKE_SOURCE_DIR}/ThirdPartyDownloads/jquery-3.7.1.min.js
   ${CMAKE_CURRENT_BINARY_DIR}/vue-2.6.14/dist/vue.min.js
-  ${CMAKE_CURRENT_BINARY_DIR}/axios-0.19.0/dist/axios.min.js
-  ${CMAKE_CURRENT_BINARY_DIR}/axios-0.19.0/dist/axios.min.map
+  ${CMAKE_CURRENT_BINARY_DIR}/axios-1.7.5/dist/axios.min.js
+  ${CMAKE_CURRENT_BINARY_DIR}/axios-1.7.5/dist/axios.min.js.map
   ${CMAKE_CURRENT_BINARY_DIR}/pdfjs/pdf.js
   ${CMAKE_CURRENT_BINARY_DIR}/pdfjs/pdf.js.map
   ${CMAKE_CURRENT_BINARY_DIR}/pdfjs/pdf.worker.js