Fix an issue with tag saving #2
Open
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
Track v1.2.x of annotatorjs
Merges branch 'node_based_annotations' of git://github.com/danohuiginn/openethnographer
Node based annotations: small fixes
…' of git://github.com/danohuiginn/openethnographer
…location) Conflicts: drupal_annotation/annotation.install
… into danohuiginn-tags
…into danohuiginn-tags
… created on the fly
…tent display". Merges branch 'danohuiginn-node_based_annotations'. Conflicts: drupal_annotation/annotation.install
Fixes #4 I've also done some (manual) testing of things like commas, other punctuation, cyrillic and chinese characters. It would be good (but low-priority) to write a few proper tests for awkward tag contents.
For this to work, you need to: - install and enable the taxonomy_display plugin - turn on taxonomy_display for the openethnographer vocabulary (/#overlay=admin/structure/taxonomy/openethnographer/edit) - set 'term display' to 'openethnographer term display' at admin/structure/taxonomy/openethnographer/display/full - on the same page, set 'associated content display' to 'hidden' Fixes #22
Conflicts: drupal_annotator/annotator.module
Fixes #10 This just writes the links straight into the annotatorjs tags plugin. There's possibly a better place to put this, but laziness.
To see the changes (e.g. in the taxonomy term pages / quotation manager), re-enable the annotato module.
All very hacky, needing to be torn down and replaced Conflicts: drupal_annotation/annotation.store.inc drupal_annotator/annotator_view/categories.js drupal_annotator/annotator_view/css/style.css drupal_annotator/annotator_view/img/Compartido.png drupal_annotator/annotator_view/img/edit-icon.png drupal_annotator/annotator_view/img/icono_eliminar.png drupal_annotator/annotator_view/img/papelera_over.png drupal_annotator/annotator_view/img/shared-icon.png drupal_annotator/annotator_view/lib/jquery-i18n-master/.gitignore drupal_annotator/annotator_view/lib/jquery-i18n-master/Gruntfile.js drupal_annotator/annotator_view/lib/jquery-i18n-master/LICENSE drupal_annotator/annotator_view/lib/jquery-i18n-master/README.md drupal_annotator/annotator_view/lib/jquery-i18n-master/SpecRunner.html drupal_annotator/annotator_view/lib/jquery-i18n-master/bower.json drupal_annotator/annotator_view/lib/jquery-i18n-master/examples/index.html drupal_annotator/annotator_view/lib/jquery-i18n-master/examples/jquery-1.4.2.js drupal_annotator/annotator_view/lib/jquery-i18n-master/jquery.i18n.js drupal_annotator/annotator_view/lib/jquery-i18n-master/jquery.i18n.min.js drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/MIT.LICENSE drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/jasmine-html.js drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/jasmine.css drupal_annotator/annotator_view/lib/jquery-i18n-master/lib/jasmine-1.2.0/jasmine.js drupal_annotator/annotator_view/lib/jquery-i18n-master/package.json drupal_annotator/annotator_view/lib/jquery-i18n-master/specs/jquery.i18n.spec.js drupal_annotator/annotator_view/lib/jquery-i18n-master/src/jquery.i18n.js drupal_annotator/annotator_view/lib/jquery.dateFormat.js drupal_annotator/annotator_view/lib/jquery.slimscroll.js drupal_annotator/annotator_view/view_annotator.js
Just keep the code for adding in a sidebar
Based on that of Annotator: GNU GPL 3.0 or MIT.
…itor image dialogue
Workaround for issue #56
Autocomplete shows all codes, regardless of author
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.
A small "reverse pull request" to keep you updated :) Fixes that tags did not save except if they did not yet exist and were consequentially created on the fly. The relevant update is only commit af3e777 (the other commits do not hurt but are there just b/c Github seemingly does not allow pull requests made with git cherry-picking …).