Annotation Tools Reverting commit @3bfb633 and updating openseadragon.js for latest build - #4019
Merged
Merged
Conversation
Contributor
|
Makes sense, 🎋 ⛵ 🚀 (from me and @sarina ). Merging... |
flowerhack
added a commit
that referenced
this pull request
Jun 6, 2014
Annotation Tools Reverting commit @3bfb633 and updating openseadragon.js for latest build
Contributor
|
Right, that's because Descriptor should inherit those fields also. |
singingwolfboy
pushed a commit
that referenced
this pull request
Jun 11, 2014
Reverting commit @3bfb633 and updating openseadragon.js for latest build Conflicts: common/lib/xmodule/xmodule/imageannotation_module.py common/lib/xmodule/xmodule/textannotation_module.py common/lib/xmodule/xmodule/videoannotation_module.py
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Urgent Fix to merged PR #3969
Issue: Tried to accomplish an issue raised by @auraz where I should factor out variables for the annotation tools. Basically
textannotation_module.py,imageannotation_module.py, andvideoannotation_module.pyeach had instances ofannotation_storage_url,annotation_mode, etc. I tried to compile them all intoannotator_mixin.py. Thought it had worked and pushed the fixes but it turns out that if you go to studio you get the following message anytime I hit "Edit" for image, text and annotation components in studio:Basically those 4 files got reverted to how they were before commit 3bfb633.
It was made known to us less than an hour ago that the file openseadragon.js we were using was using a different api call then the server so this is a 2-line change to make it work while we upgrade.