Skip to content

Commit

Permalink
Merge pull request #1266 from girder/hammer-library
Browse files Browse the repository at this point in the history
Use a newer version of the hammerjs touch events library in Girder
  • Loading branch information
manthey authored Aug 18, 2023
2 parents d41fe27 + 6957f87 commit 66838b6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion girder/girder_large_image/web_client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down

0 comments on commit 66838b6

Please sign in to comment.