Skip to content

Commit

Permalink
Merge branch 'eeditiones:master' into gradient-highlight
Browse files Browse the repository at this point in the history
  • Loading branch information
emmamorlock authored May 30, 2024
2 parents 0563934 + 90c2788 commit 40e27c9
Show file tree
Hide file tree
Showing 18 changed files with 539 additions and 79 deletions.
86 changes: 86 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,89 @@
## [2.23.2](https://github.com/eeditiones/tei-publisher-components/compare/v2.23.1...v2.23.2) (2024-05-19)


### Bug Fixes

* **pb-facs-link:** emit-on-load should also wait for pb-facsimile/pb-tify to be available ([b16730a](https://github.com/eeditiones/tei-publisher-components/commit/b16730a07c7d930080b35de2de9af75da93b3ab2))
* **pb-mixin:** fix bug in wait method introduced by 189d5a1ac87014db3452f846cf506616a12959f4 ([afb665d](https://github.com/eeditiones/tei-publisher-components/commit/afb665d9a720c484bbf0549628780920f7a91447))
* **pb-mixin:** the wait method needs to make sure the HTML DOM has been loaded entirely before selecting elements to wait for ([189d5a1](https://github.com/eeditiones/tei-publisher-components/commit/189d5a1ac87014db3452f846cf506616a12959f4))
* **pb-tify:** emit ready event element is connected ([b8bae11](https://github.com/eeditiones/tei-publisher-components/commit/b8bae1199030dd8d3b68307507be9ac3246a4e9f))

## [2.23.1](https://github.com/eeditiones/tei-publisher-components/compare/v2.23.0...v2.23.1) (2024-05-16)


### Bug Fixes

* **pb-authority-lookup, anton:** avoid error if json.data.location == null ([d06a34a](https://github.com/eeditiones/tei-publisher-components/commit/d06a34acc923b80b3b788bef5fa6fb2aecd18a35))

# [2.23.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.22.2...v2.23.0) (2024-05-15)


### Features

* **pb-facsimile:** added option to add download icon to trigger download of current viewport. Added a demo for the feature ([0233c83](https://github.com/eeditiones/tei-publisher-components/commit/0233c8333e9e78ed529a21361e358974c1cecf46))

## [2.22.2](https://github.com/eeditiones/tei-publisher-components/compare/v2.22.1...v2.22.2) (2024-05-02)


### Bug Fixes

* **pb-grid:** emit pb-refresh to configured channel only ([63091ab](https://github.com/eeditiones/tei-publisher-components/commit/63091ab6d509770b8b847fe25fe5a1a2ed7d86e8))

## [2.22.1](https://github.com/eeditiones/tei-publisher-components/compare/v2.22.0...v2.22.1) (2024-05-02)


### Bug Fixes

* **pb-grid:** remove panel broken ([44bcf81](https://github.com/eeditiones/tei-publisher-components/commit/44bcf8150832042c9706cc8e3e4dee8c19db9689))

# [2.22.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.21.0...v2.22.0) (2024-05-02)


### Features

* adds zoom to pb-grid ([c3f557d](https://github.com/eeditiones/tei-publisher-components/commit/c3f557d83ff13e23dad5a9162af5f9f0f7e319ad))

# [2.21.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.20.0...v2.21.0) (2024-05-02)


### Bug Fixes

* no scrolling when component is disabled ([dfe1881](https://github.com/eeditiones/tei-publisher-components/commit/dfe188178d556608501a5e600ccb81591565e6c2))


### Features

* changes vertical alignment of scroll ([38b8dce](https://github.com/eeditiones/tei-publisher-components/commit/38b8dce6f5e6dc63c38aa34905b21dc1ab832c33))

# [2.20.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.19.3...v2.20.0) (2024-05-02)


### Features

* **pb-grid:** support dragging a panel to a different position in the grid ([4cf75f8](https://github.com/eeditiones/tei-publisher-components/commit/4cf75f8edb0294a8943846037c44a41e87a76afd))

## [2.19.3](https://github.com/eeditiones/tei-publisher-components/compare/v2.19.2...v2.19.3) (2024-04-25)


### Bug Fixes

* **pb-facsimile:** using patched OSD from jinntec/openseadragon and corrected finding the pb-page element. ([2a89c8d](https://github.com/eeditiones/tei-publisher-components/commit/2a89c8d108260608eab76ade31b81f289ce1902b))

## [2.19.2](https://github.com/eeditiones/tei-publisher-components/compare/v2.19.1...v2.19.2) (2024-03-23)


### Bug Fixes

* **pb-tify:** make sure container div is created ([e96f4f2](https://github.com/eeditiones/tei-publisher-components/commit/e96f4f2ba27d83096c5cf84ce4943bd00ba62091))

## [2.19.1](https://github.com/eeditiones/tei-publisher-components/compare/v2.19.0...v2.19.1) (2024-02-16)


### Bug Fixes

* **pb-leaflet-map:** pb-leaflet-marker-click event details should include reference to pb-geolocation element where possible ([da54cdb](https://github.com/eeditiones/tei-publisher-components/commit/da54cdb99bda19ab2bb9386d5d0e2e3b3196ee19))
* **pb-table-grid:** react to language changes ([50cc2a0](https://github.com/eeditiones/tei-publisher-components/commit/50cc2a019bde937061499cd151cda9aed455c31a))

# [2.19.0](https://github.com/eeditiones/tei-publisher-components/compare/v2.18.4...v2.19.0) (2024-01-26)


Expand Down
3 changes: 2 additions & 1 deletion demo/demos.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
},
"pb-facsimile": {
"demo/pb-facsimile.html": "Demo",
"demo/pb-facsimile-2.html": "Align text page with facsimile"
"demo/pb-facsimile-2.html": "Align text page with facsimile",
"demo/pb-facsimile-3.html": "With Download Button"
},
"pb-image-strip": {
"demo/pb-image-strip-view.html": "Demo with pb-view",
Expand Down
82 changes: 82 additions & 0 deletions demo/pb-facsimile-3.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<html>

<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes" />

<title>pb-view Demo</title>
<!--scripts-->
<script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js" defer></script>
<script type="module" src="../src/docs/pb-demo-snippet.js"></script>
<script type="module" src="../node_modules/@polymer/iron-icons/iron-icons.js"></script>
<script type="module" src="../node_modules/@polymer/paper-fab/paper-fab.js"></script>
<script type="module" src="../src/pb-page.js"></script>
<script type="module" src="../src/pb-document.js"></script>
<script type="module" src="../src/pb-view.js"></script>
<script type="module" src="../src/pb-navigation.js"></script>
<script type="module" src="../src/pb-facsimile.js"></script>
<script type="module" src="../src/pb-facs-link.js"></script>
<!--/scripts-->
</head>

<body>
<pb-demo-snippet>
<template>
<style type="text/css">
body {
--paper-fab-background: #35424b;
}

main {
position: relative;
height: 70vh;
display: flex;
flex-direction: row;
justify-content: flex-start;
}

pb-navigation {
position: absolute;
bottom: 45%;
--paper-fab-background: #35424b;
color: white;
}

pb-navigation[direction=backward] {
left: 20px;
}

pb-navigation[direction=forward] {
right: 20px;
}

pb-facsimile {
flex: 1 1;
max-width: 50vw;
margin-right: 20px;
}
</style>
<pb-page endpoint="http://localhost:8080/exist/apps/tei-publisher" url-path="query">
<pb-document id="document1" path="test/cortes_to_dantiscus.xml" odd="dantiscus"></pb-document>
<main>
<pb-facsimile base-uri="https://apps.existsolutions.com/cantaloupe/iiif/2/" default-zoom-level="0"
show-navigator show-navigation-control show-home-control show-download-control subscribe="transcription">
</pb-facsimile>

<!-- Navigate to previous page -->
<pb-navigation direction="backward" keyboard="left">
<paper-fab icon="icons:chevron-left"></paper-fab>
</pb-navigation>
<pb-view id="view1" src="document1" view="page" xpath="//text[@type='source']" append-footnotes>
</pb-view>
<!-- Navigate to next page -->
<pb-navigation direction="forward" keyboard="right">
<paper-fab icon="icons:chevron-right"></paper-fab>
</pb-navigation>
</main>
</pb-page>
</template>
</pb-demo-snippet>
</body>

</html>
79 changes: 75 additions & 4 deletions lib/openseadragon.min.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions lib/read-me-osd.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## Openseadragon

We are using our own patched version of OSD from https://github.com/Jinntec/openseadragon

Reason:
OSD removes all body children when going to fullscreen. This creates issues with `<pb-page>` also be gone so display is empty after existing full-screen.

Fork is up-to-date with upstream OSD 4.1.1




4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@teipublisher/pb-components",
"version": "2.19.0",
"version": "2.23.2",
"description": "Collection of webcomponents underlying TEI Publisher",
"repository": "https://github.com/eeditiones/tei-publisher-components.git",
"main": "index.html",
Expand Down
4 changes: 3 additions & 1 deletion src/authority/anton.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ export class Anton extends Registry {
switch (this._register) {
case 'place':
output.country = json.data.country;
output.location = json.data.location.coordinates;
if (json.data.location && json.data.location.coordinates) {
output.location = json.data.location.coordinates;
}
output.links = json.data.links.map((link) => link.url);
break;
case 'person':
Expand Down
2 changes: 1 addition & 1 deletion src/pb-facs-link.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export class PbFacsLink extends pbMixin(LitElement) {
const link = this.shadowRoot.querySelector('a');
link.addEventListener(this.trigger, this._linkListener.bind(this));
if (this.emitOnLoad) {
this._trigger();
this.wait(() => { this._trigger(); });
}
}

Expand Down
Loading

0 comments on commit 40e27c9

Please sign in to comment.