From c86fc046fdd461ae11fb9bbf52db46278bc88b03 Mon Sep 17 00:00:00 2001 From: David Manthey Date: Thu, 23 May 2024 14:54:26 -0400 Subject: [PATCH] Reject the promise from a canceled annotation --- CHANGELOG.md | 1 + .../web_client/views/imageViewerWidget/geojs.js | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da42221bc..634799e4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ### Improvements - Better detect available memory in containers ([#1532](../../pull/1532)) +- Reject the promise from a canceled annotation ([#1535](../../pull/1535)) ### Changes - Log more when saving annotations ([#1525](../../pull/1525)) diff --git a/girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js b/girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js index 99e245fde..9fb9f0589 100644 --- a/girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js +++ b/girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js @@ -892,12 +892,14 @@ var GeojsImageViewerWidgetExtension = function (viewer) { } ); layer.mode(type, undefined, options.modeOptions); - if (options.signalModeChange) { - layer.geoOn(window.geo.event.annotation.mode, (evt) => { - layer.geoOff(window.geo.event.annotation.mode); + layer.geoOn(window.geo.event.annotation.mode, (evt) => { + layer.geoOff(window.geo.event.annotation.state); + layer.geoOff(window.geo.event.annotation.mode); + if (options.signalModeChange) { events.trigger('li:drawModeChange', {event: evt}); - }); - } + } + defer.reject(); + }); return defer.promise(); },