Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reject the promise from a canceled annotation #1535

Merged
merged 1 commit into from
May 23, 2024
Merged

Reject the promise from a canceled annotation #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
12 changes: 7 additions & 5 deletions girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,12 +892,14 @@
}
);
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);

Check warning on line 897 in girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js

View check run for this annotation

Codecov / codecov/patch

girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js#L896-L897 

Added lines #L896 - L897 were not covered by tests
if (options.signalModeChange) {
events.trigger('li:drawModeChange', {event: evt});
});
}
}
defer.reject();

Check warning on line 901 in girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js

View check run for this annotation

Codecov / codecov/patch

girder_annotation/girder_large_image_annotation/web_client/views/imageViewerWidget/geojs.js#L901 

Added line #L901 was not covered by tests
});
return defer.promise();
},

Expand Down