aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/collections/collectionFreeForm
diff options
context:
space:
mode:
authorMonika <monika_hedman@brown.edu>2019-06-25 17:32:35 -0400
committerMonika <monika_hedman@brown.edu>2019-06-25 17:32:35 -0400
commit22d0fdc4f3114b4d46161e02265eafd371bf472d (patch)
treef42f207aa40f2d1cff66cd08c11f0ad193173ff4 /src/client/views/collections/collectionFreeForm
parentf5082af730d3fb43e4562411b072155d7e358c1c (diff)
parent219cabb3fe42ab199550efc3423b7aaed4e1ee93 (diff)
Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into searchUI
Diffstat (limited to 'src/client/views/collections/collectionFreeForm')
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index f756fe625..4b4e7465a 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -217,7 +217,7 @@ export class CollectionFreeFormView extends CollectionSubView(PanZoomDocument) {
} else {
// if (modes[e.deltaMode] === 'pixels') coefficient = 50;
// else if (modes[e.deltaMode] === 'lines') coefficient = 1000; // This should correspond to line-height??
- let deltaScale = (1 - (e.deltaY / coefficient));
+ let deltaScale = e.deltaY > 0 ? (1 / 1.1) : 1.1;
if (deltaScale * this.zoomScaling() < 1 && this.isAnnotationOverlay) {
deltaScale = 1 / this.zoomScaling();
}