@teipublisher/pb-components 2.10.6 → 2.11.0

package/i18n/common/en.json

@@ -148,6 +148,9 @@
       "save": "Save",
       "saving": "Saving ...",
       "saved": "Saved",
+      "unsaved": "There are unsaved changes, which will be included in the export! Continue anyway?",
+      "download": "Download ODD",
+      "save-as": "Save ODD to directory",
       "denied": "Permission Denied",
       "denied-message": "You do not have permission to save {{odd}}",
       "reload": "Reload",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teipublisher/pb-components",
-  "version": "2.10.6",
+  "version": "2.11.0",
   "description": "Collection of webcomponents underlying TEI Publisher",
   "repository": "https://github.com/eeditiones/tei-publisher-components.git",
   "main": "index.html",
@@ -39,7 +39,7 @@
     "@babel/runtime": "7.11.2",
     "@cwmr/paper-autocomplete": "^4.0.0",
     "@jinntec/jinn-codemirror": "^1.13.5",
-    "@lrnwebcomponents/es-global-bridge": "^2.7.10",
+    "@lrnwebcomponents/es-global-bridge": "^7.0.4",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/iron-ajax": "^3.0.1",
     "@polymer/iron-collapse": "^3.0.1",
@@ -69,6 +69,7 @@
     "@vaadin/vaadin-upload": "^4.4.0",
     "@webcomponents/webcomponentsjs": "latest",
     "animejs": "^3.2.0",
+    "browser-fs-access": "^0.34.1",
     "construct-style-sheets-polyfill": "^3.1.0",
     "gridjs": "^5.0.2",
     "hotkeys-js": "^3.8.1",
@@ -77,16 +78,16 @@
     "i18next-chained-backend": "^2.0.1",
     "i18next-xhr-backend": "^3.2.2",
     "js-cookie": "^2.2.1",
-    "leaflet": "^1.7.1",
+    "leaflet": "^1.9.4",
     "leaflet.markercluster": "^1.5.3",
     "lit-element": "^2.5.1",
     "lit-html": "^1.3.0",
     "marked": "^1.2.0",
-    "pagedjs": "^0.4.0",
+    "pagedjs": "^0.4.3",
     "path-to-regexp": "^6.2.1",
-    "prismjs": "^1.21.0",
+    "prismjs": "^1.29.0",
     "tify": "^0.28.1",
-    "tippy.js": "^6.2.7",
+    "tippy.js": "^6.3.7",
     "tom-select": "^2.2.2",
     "uniqolor": "^1.1.0",
     "web-animations-js": "^2.3.2"
@@ -109,7 +110,7 @@
     "karma": "^6.4.1",
     "lint-staged": "^10.4.0",
     "recursive-copy": "^2.0.14",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.1",
     "rollup": "^1.21.0",
     "rollup-plugin-analyzer": "^3.2.3",
     "rollup-plugin-babel": "^4.4.0",

package/pb-elements.json

@@ -4145,11 +4145,6 @@
           "type": "number",
           "default": "0.2"
         },
-        {
-          "name": "src",
-          "type": "string",
-          "default": "\"\""
-        },
         {
           "name": "prefix-url",
           "description": "Path pointing to the location of openseadragon user interface images.",
@@ -4293,12 +4288,6 @@
           "type": "number",
           "default": "0.2"
         },
-        {
-          "name": "src",
-          "attribute": "src",
-          "type": "string",
-          "default": "\"\""
-        },
         {
           "name": "prefixUrl",
           "attribute": "prefix-url",
@@ -4357,8 +4346,8 @@
           "description": "When received, resets the facsimile viewer"
         },
         {
-          "name": "pb-update",
-          "description": "Checks the contents received for pb-facs-links"
+          "name": "pb-load-facsimile",
+          "description": "When received, adds an image to the current image sequence. Emitted by \n`pb-facs-link`. The event detail should contain an object with the properties `url`, `order` and `element`,\nwhere `url` is the relative or absolute URL to the image, `order` is an integer specifying the position at which\nthe image should be inserted in the list, and `element` points to the `pb-facs-link` element triggering the event."
         },
         {
           "name": "pb-show-annotation",

package/src/pb-facsimile.js

@@ -7,7 +7,10 @@ import { resolveURL } from './utils.js';
  * View zoomable images using a IIIF server.
  *
  * @fires pb-start-update - When received, resets the facsimile viewer
- * @fires pb-update - Checks the contents received for pb-facs-links
+ * @fires pb-load-facsimile - When received, adds an image to the current image sequence. Emitted by 
+ * `pb-facs-link`. The event detail should contain an object with the properties `url`, `order` and `element`,
+ * where `url` is the relative or absolute URL to the image, `order` is an integer specifying the position at which
+ * the image should be inserted in the list, and `element` points to the `pb-facs-link` element triggering the event.
  * @fires pb-show-annotation - When received, sets up the viewer to select a particular image and highlight coordinates
  * @fires pb-facsimile-status - Indicates the status of loading an image into the viewer. The status is indicated
  * by the `status` property in event.detail as follows: `loading` - image was requested; `loaded` - image is displayed;
@@ -24,10 +27,6 @@ export class PbFacsimile extends pbMixin(LitElement) {
     static get properties() {
         return {
             ...super.properties,
-            // Image source
-            src: {
-                type: String
-            },
             /**
              * Set to false to prevent the appearance of the default navigation controls.
              * Note that if set to false, the customs buttons set by the options
@@ -159,7 +158,6 @@ export class PbFacsimile extends pbMixin(LitElement) {
         this.constrainDuringPan = false;
         this.referenceStrip = false;
         this.referenceStripSizeRatio = 0.2;
-        this.src = '';
         this.prefixUrl = '../images/openseadragon/';
         this.loaded = false;
     }

package/src/pb-odd-editor.js

@@ -1,5 +1,6 @@
 // @ts-nocheck
-import { LitElement, html, css } from 'lit-element'
+import { LitElement, html, css } from 'lit-element';
+import { supported as fsSupported, fileSave } from "browser-fs-access";
 import { pbMixin, waitOnce } from './pb-mixin.js';
 import { pbHotkeys } from './pb-hotkeys.js';
 import { repeat } from 'lit-html/directives/repeat';
@@ -290,6 +291,7 @@ export class PbOddEditor extends pbHotkeys(pbMixin(LitElement)) {
         this.hotkeys = {
             save: 'ctrl+shift+s,command+shift+s'
         }
+        this._hasChanges = false;
     }
 
     render() {
@@ -311,6 +313,7 @@ export class PbOddEditor extends pbHotkeys(pbMixin(LitElement)) {
 
                         <span class="icons">
                             <pb-edit-xml id="editSource"><paper-icon-button icon="code" title="${translate('odd.editor.odd-source')}"></paper-icon-button></pb-edit-xml>
+                            <paper-icon-button @click="${this._download}" icon="icons:cloud-download" title="${fsSupported ? translate('odd.editor.save-as'): translate('odd.editor.download')}"></paper-icon-button>
                             <paper-icon-button @click="${this._reload}" icon="refresh" title="${translate('odd.editor.reload')}"></paper-icon-button>
                             <paper-icon-button @click="${this.save}" icon="save" title="${translate('odd.editor.save')} ${this.display('save')}" 
                                 ?disabled="${!this.loggedIn}"></paper-icon-button>
@@ -473,6 +476,7 @@ export class PbOddEditor extends pbHotkeys(pbMixin(LitElement)) {
         this.loadContent.url = `${this.getEndpoint()}/${this.lessThanApiVersion('1.0.0') ? 'modules/editor.xql' : 'api/odd/' + this.odd}`;
         const request = this.loadContent.generateRequest();
 
+        this._hasChanges = false;
         request.completes.then(r => this.handleOdd(r));
     }
 
@@ -888,10 +892,34 @@ export class PbOddEditor extends pbHotkeys(pbMixin(LitElement)) {
         return code;
     }
 
-    save(e) {
+    _download() {
+        if (this._hasChanges) {
+            const dialog = this.shadowRoot.getElementById('dialog');
+            dialog.confirm(i18n("odd.editor.save"), i18n('odd.editor.unsaved'))
+                .then(
+                    () => this._downloadOdd(), 
+                    () => console.log('<pb-odd-editor> Download aborted'));
+            return;
+        }
+        this._downloadOdd();
+    }
+
+    _downloadOdd() {
+        const data = this.serializeOdd();
+        const blob = new Blob([data], { type: 'application/xml'});
+        fileSave(blob, {
+            fileName: this.odd,
+            extensions: ['.odd'],
+        })
+        .then(
+            () => console.log(`<pb-odd-editor> ${this.odd} exported`),
+            () => console.log('<pb-odd-editor> export aborted')
+        );
+    }
+
+    save() {
         document.dispatchEvent(new CustomEvent('pb-start-update'));
-        const data = this.serializeOdd()
-        console.log('serialised ODD:', data)
+        const data = this.serializeOdd();
 
         this.shadowRoot.getElementById('dialog').show(i18n("odd.editor.save"), i18n('odd.editor.saving'));
 
@@ -964,6 +992,7 @@ export class PbOddEditor extends pbHotkeys(pbMixin(LitElement)) {
         
         this.shadowRoot.getElementById('dialog').set(i18n("odd.editor.saved"), msg);
 
+        this._hasChanges = false;
         document.dispatchEvent(new CustomEvent('pb-end-update'));
     }
 
@@ -1040,6 +1069,7 @@ export class PbOddEditor extends pbHotkeys(pbMixin(LitElement)) {
 
     handleElementSpecChanged(e) {
         // console.log('handleElementSpecChanged ',e);
+        this._hasChanges = true;
         const elementSpec = this.elementSpecs.find(es => es.ident === e.detail.ident);
         const index = this.elementSpecs.indexOf(elementSpec);
         const newSpec = Object.assign({}, elementSpec, { models: e.detail.models });

package/src/pb-view.js

@@ -575,6 +575,8 @@ export class PbView extends themableMixin(pbMixin(LitElement)) {
             }
             if (ev.detail.id) {
                 this.xmlId = ev.detail.id;
+            } else if (ev.detail.id == null) {
+                this.xmlId = null;
             }
             this.odd = ev.detail.odd || this.odd;
             if (ev.detail.columnSeparator !== undefined) {
@@ -783,7 +785,6 @@ export class PbView extends themableMixin(pbMixin(LitElement)) {
         this.previousId = resp.previousId;
         this.nodeId = resp.root;
         this.switchView = resp.switchView;
-        this.xmlId = null;
 
         this.updateComplete.then(() => {
             const view = this.shadowRoot.getElementById('view');
@@ -1102,7 +1103,8 @@ export class PbView extends themableMixin(pbMixin(LitElement)) {
                         root: this.previousId ? null : this.previous
                     });
                 }
-                this._load(this.previous, direction);
+                this.xmlId = this.previousId;
+                this._load(this.xmlId ? null : this.previous, direction);
             }
         } else if (this.next) {
             if (!this.disableHistory && !this.map) {
@@ -1111,7 +1113,8 @@ export class PbView extends themableMixin(pbMixin(LitElement)) {
                     root: this.nextId ? null : this.next
                 });
             }
-            this._load(this.next, direction);
+            this.xmlId = this.nextId;
+            this._load(this.xmlId ? null : this.next, direction);
         }
     }
 

package/dist/es-global-bridge-5c039c0b.js

@@ -1,5 +0,0 @@
-/**
- * Copyright 2018 The Pennsylvania State University
- * @license Apache-2.0, see License.md for full text.
- */
-class o{constructor(){this.load=(o,i,e=!1)=>{let l=window.ESGlobalBridge.imports&&window.ESGlobalBridge.imports[o];if(!(!e&&window.ESGlobalBridge.webpack&&window.ESGlobalBridge.webpack[o])&&!l)return new Promise((e,l)=>{const d=document.createElement("script");d.src=i,d.setAttribute("data-name",o),window.ESGlobalBridge.imports[o]=i,d.onload=()=>{e(window.ESGlobalBridge.imports[o]),window.ESGlobalBridge.imports[o]=!0,setTimeout(()=>{const e=new CustomEvent(`es-bridge-${o}-loaded`,{bubbles:!0,cancelable:!0,detail:{name:o,location:i}});document.dispatchEvent(e)},100)},d.onerror=()=>{l(new Error(`Failed to load ${o} script with location ${i}.`)),delete window.ESGlobalBridge.imports[o],window.ESGlobalBridge.imports[o]=!1},document.documentElement.appendChild(d)})}}}window.ESGlobalBridge=window.ESGlobalBridge||{},window.ESGlobalBridge.imports=window.ESGlobalBridge.imports||{},window.ESGlobalBridge.requestAvailability=()=>(window.ESGlobalBridge.instance||(window.ESGlobalBridge.instance=new o),window.ESGlobalBridge);window.ESGlobalBridge.requestAvailability();