feat(annotations): Add support for image annotations #1221
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jstoffan
force-pushed
the
add-image-support
branch
2 times, most recently
from
5217238 to
11e8caf
Compare
jstoffan
force-pushed
the
add-image-support
branch
from
11e8caf to
286e4aa
Compare
jstoffan
commented
Jun 15, 2020
| @@ -1090,7 +1112,7 @@ class BaseViewer extends EventEmitter { | |||
| const { showAnnotationsControls, file } = this.options; | |||
| const { permissions, extension } = file || {}; | |||
|
|
|||
| if (!this.hasAnnotationPermissions(permissions)) { | |||
| if (!this.hasAnnotationCreatePermission(permissions) && !this.hasAnnotationViewPermission(permissions)) { | |||
There was a problem hiding this comment.
These changes will ensure that the controls won't be shown until the backend enables support for the file type being previewed.
jstoffan
commented
Jun 15, 2020
| @@ -339,8 +344,8 @@ class ImageViewer extends ImageBaseViewer { | |||
| this.imageEl.style.top = `${topPadding}px`; | |||
|
|
|||
| // Fix the scroll position of the image to be centered | |||
| this.wrapperEl.scrollLeft = (this.wrapperEl.scrollWidth - viewport.width) / 2; | |||
| this.wrapperEl.scrollTop = (this.wrapperEl.scrollHeight - viewport.height) / 2; | |||
| this.wrapperEl.scrollLeft = (this.imageEl.clientWidth - viewport.width) / 2; | |||
There was a problem hiding this comment.
There is more inside the wrapper now (annotations), so we need to look at the size of the actual image for our scroll reference.
mxiao6
approved these changes
Jun 15, 2020
| removeAllListeners: sandbox.mock(), | ||
| destroy: sandbox.mock(), | ||
| removeAllListeners: sandbox.stub(), | ||
| destroy: sandbox.stub(), |
There was a problem hiding this comment.
Why use stub here but use mock in the above test?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requires box/box-annotations#508 to function properly.
Todo