From 6957f875e03ffe691ecac6913bb1102f17d523e5 Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Fri, 18 Aug 2023 09:32:55 -0400
Subject: [PATCH] Use a newer version of the hammerjs touch events library in
 Girder

This has less conflicts with some other newer packages.
---
 CHANGELOG.md                                                    | 1 +
 girder/girder_large_image/web_client/package.json               | 2 +-
 .../web_client/views/imageViewerWidget/geojs.js                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 811a40ac6..ff864f7b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Changes
 - Adjust tifffile log level ([#1265](../../pull/1265))
+- Use a newer version of the hammerjs touch events library in Girder ([#1266](../../pull/1266))
 
 ## 1.23.3
 
diff --git a/girder/girder_large_image/web_client/package.json b/girder/girder_large_image/web_client/package.json
index d9a20b0df..ea0cbe4d8 100644
--- a/girder/girder_large_image/web_client/package.json
+++ b/girder/girder_large_image/web_client/package.json
@@ -19,7 +19,7 @@
         "copy-webpack-plugin": "^4.5.2",
         "d3": "^3.5.16",
         "geojs": "^1.8.6",
-        "hammerjs": "^2.0.8",
+        "@egjs/hammerjs": "^2.0.8",
         "js-yaml": "^4.1.0",
         "jsonlint-mod": "^1.7.6",
         "sinon": "^2.1.0",
diff --git a/girder/girder_large_image/web_client/views/imageViewerWidget/geojs.js b/girder/girder_large_image/web_client/views/imageViewerWidget/geojs.js
index 5748740f9..284e50bd9 100644
--- a/girder/girder_large_image/web_client/views/imageViewerWidget/geojs.js
+++ b/girder/girder_large_image/web_client/views/imageViewerWidget/geojs.js
@@ -3,7 +3,7 @@
 import $ from 'jquery';
 import _ from 'underscore';
 // Import hammerjs for geojs touch events
-import Hammer from 'hammerjs';
+import Hammer from '@egjs/hammerjs';
 import d3 from 'd3';
 
 import {restRequest} from '@girder/core/rest';