Skip to content
Snippets Groups Projects

Manifest side to side

2 unresolved threads

This reverts commit afa0281b.

Use this manifest for testing : https://anthony.pages.tetras-libre.fr/demo-content/manifests/test5.json

Closes #17 (closed)

Merge request reports

Pipeline #1371 passed

Pipeline passed for 0987ddf8 on 17-8-open-an-other-manifest-side-by-side-from-an-annotation

Merged by David BeniamineDavid Beniamine 2 years ago (Feb 22, 2023 1:43pm UTC)

Loading

Pipeline #1372 passed

Pipeline passed for 735afa7d on annotation-on-video

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • David Beniamine
  • 42 43 /** */
    43 44 handleAnnotationHover(annotation) {
    44 45 const { hoverAnnotation, windowId } = this.props;
    45
  • 42 43 /** */
    43 44 handleAnnotationHover(annotation) {
    44 45 const { hoverAnnotation, windowId } = this.props;
    45
    46 46 hoverAnnotation(windowId, [annotation.id]);
    47 47 }
    48 48
    49 49 /** */
    50 50 handleAnnotationBlur() {
    51 51 const { hoverAnnotation, windowId } = this.props;
    52
  • David Beniamine
  • Globally it seems good, just a few easy changes to avoid git conflict and a small code duplication

  • Anthony added 1 commit

    added 1 commit

    Compare with previous version

  • Anthony added 1 commit

    added 1 commit

    • ab462f10 - Update style with multiple manifests

    Compare with previous version

  • Anthony added 2 commits

    added 2 commits

    • becee206 - Fix removeDuplicate and typo style
    • f5c67b8c - Rollback package lock to test

    Compare with previous version

  • Anthony added 49 commits

    added 49 commits

    • f5c67b8c...a9b9b6d1 - 46 commits from branch annotation-on-video
    • b0223b70 - Update package.json
    • f0be19d5 - Merge branch 'annotation-on-video' into 17-8-open-an-other-manifest-side-by-side-from-an-annotation
    • 333d28fa - Update package.json pack

    Compare with previous version

  • Anthony added 1 commit

    added 1 commit

    • fffa42d1 - Undo lint for stay close to main mirador branch

    Compare with previous version

  • Anthony added 1 commit

    added 1 commit

    • 590ae535 - Change default manifest to automatic test

    Compare with previous version

  • Anthony added 1 commit

    added 1 commit

    • ed63ef2c - Change default manifest to automatic test

    Compare with previous version

  • Anthony added 1 commit

    added 1 commit

    Compare with previous version

  • Anthony added 1 commit

    added 1 commit

    • 0987ddf8 - Fix bug when having annotation with no manifests

    Compare with previous version

  • David Beniamine mentioned in commit 735afa7d

    mentioned in commit 735afa7d

  • Please register or sign in to reply
    Loading