Skip to content
Snippets Groups Projects
Commit dff6d888 authored by Reiter, Christoph's avatar Reiter, Christoph :snake:
Browse files

Update toolkit

parent 8a564082
No related branches found
No related tags found
No related merge requests found
...@@ -297,14 +297,14 @@ Dependencies: ...@@ -297,14 +297,14 @@ Dependencies:
}, },
{src: 'node_modules/pdfjs-dist/cmaps/*', dest: 'dist/local/' + pkg.name + '/pdfjs'}, // do we want all map files? {src: 'node_modules/pdfjs-dist/cmaps/*', dest: 'dist/local/' + pkg.name + '/pdfjs'}, // do we want all map files?
{src: 'node_modules/source-sans-pro/WOFF2/OTF/*', dest: 'dist/local/' + pkg.name + '/fonts'}, {src: 'node_modules/source-sans-pro/WOFF2/OTF/*', dest: 'dist/local/' + pkg.name + '/fonts'},
{src: 'node_modules/dbp-common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'}, {src: 'node_modules/@dbp-toolkit/common/src/spinner.js', dest: 'dist/local/' + pkg.name, rename: 'spinner.js'},
{src: 'node_modules/dbp-common/misc/browser-check.js', dest: 'dist/local/' + pkg.name, rename: 'browser-check.js'}, {src: 'node_modules/@dbp-toolkit/common/misc/browser-check.js', dest: 'dist/local/' + pkg.name, rename: 'browser-check.js'},
{src: 'assets/icon-*.png', dest: 'dist/local/' + pkg.name}, {src: 'assets/icon-*.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/*-placeholder.png', dest: 'dist/local/' + pkg.name}, {src: 'assets/*-placeholder.png', dest: 'dist/local/' + pkg.name},
{src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'}, {src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'},
{src: 'assets/*.metadata.json', dest: 'dist'}, {src: 'assets/*.metadata.json', dest: 'dist'},
{src: 'node_modules/dbp-common/assets/icons/*.svg', dest: 'dist/local/dbp-common/icons'}, {src: 'node_modules/@dbp-toolkit/common/assets/icons/*.svg', dest: 'dist/local/@dbp-toolkit/common/icons'},
{src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/dbp-file-source/tabulator-tables'}, {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/@dbp-toolkit/file-handling/tabulator-tables'},
], ],
}), }),
useBabel && babel({ useBabel && babel({
......
import {createI18nInstance} from './i18n.js'; import {createI18nInstance} from './i18n.js';
import {humanFileSize} from 'dbp-common/i18next.js'; import {humanFileSize} from '@dbp-toolkit/common/i18next.js';
import {css, html} from 'lit-element'; import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import DBPSignatureLitElement from "./dbp-signature-lit-element"; import DBPSignatureLitElement from "./dbp-signature-lit-element";
import {PdfPreview} from "./dbp-pdf-preview"; import {PdfPreview} from "./dbp-pdf-preview";
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as utils from './utils'; import * as utils from './utils';
import {Button, Icon, MiniSpinner} from 'dbp-common'; import {Button, Icon, MiniSpinner} from '@dbp-toolkit/common';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import {classMap} from 'lit-html/directives/class-map.js'; import {classMap} from 'lit-html/directives/class-map.js';
import {FileSource} from 'dbp-file-handling'; import {FileSource} from '@dbp-toolkit/file-handling';
import JSONLD from "dbp-common/jsonld"; import JSONLD from "@dbp-toolkit/common/jsonld";
import {TextSwitch} from './textswitch.js'; import {TextSwitch} from './textswitch.js';
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL'; import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL'; import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
import nextcloudName from 'consts:nextcloudName'; import nextcloudName from 'consts:nextcloudName';
import {FileSink} from "dbp-file-handling"; import {FileSink} from "@dbp-toolkit/file-handling";
import {name as pkgName} from './../package.json';
const i18n = createI18nInstance(); const i18n = createI18nInstance();
...@@ -705,7 +706,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem ...@@ -705,7 +706,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
} }
render() { render() {
const placeholderUrl = commonUtils.getAssetURL('local/dbp-signature/official-signature-placeholder.png'); const placeholderUrl = commonUtils.getAssetURL(pkgName, 'official-signature-placeholder.png');
return html` return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}"> <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
......
...@@ -3,12 +3,13 @@ import {css, html} from 'lit-element'; ...@@ -3,12 +3,13 @@ import {css, html} from 'lit-element';
import {classMap} from 'lit-html/directives/class-map.js'; import {classMap} from 'lit-html/directives/class-map.js';
import {live} from 'lit-html/directives/live.js'; import {live} from 'lit-html/directives/live.js';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import DBPLitElement from 'dbp-common/dbp-lit-element'; import DBPLitElement from '@dbp-toolkit/common/dbp-lit-element';
import {MiniSpinner, Icon} from 'dbp-common'; import {MiniSpinner, Icon} from '@dbp-toolkit/common';
import * as commonUtils from "dbp-common/utils"; import * as commonUtils from "@dbp-toolkit/common/utils";
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import pdfjs from 'pdfjs-dist/es5/build/pdf.js'; import pdfjs from 'pdfjs-dist/es5/build/pdf.js';
import buildinfo from 'consts:buildinfo'; import buildinfo from 'consts:buildinfo';
import {name as pkgName} from './../package.json';
const i18n = createI18nInstance(); const i18n = createI18nInstance();
...@@ -87,7 +88,7 @@ export class PdfPreview extends ScopedElementsMixin(DBPLitElement) { ...@@ -87,7 +88,7 @@ export class PdfPreview extends ScopedElementsMixin(DBPLitElement) {
connectedCallback() { connectedCallback() {
super.connectedCallback(); super.connectedCallback();
const that = this; const that = this;
pdfjs.GlobalWorkerOptions.workerSrc = commonUtils.getAssetURL('local/dbp-signature/pdfjs/pdf.worker.js'); pdfjs.GlobalWorkerOptions.workerSrc = commonUtils.getAssetURL(pkgName, 'pdfjs/pdf.worker.js');
window.addEventListener('resize', this._onWindowResize); window.addEventListener('resize', this._onWindowResize);
......
import {createI18nInstance} from './i18n.js'; import {createI18nInstance} from './i18n.js';
import {humanFileSize} from 'dbp-common/i18next.js'; import {humanFileSize} from '@dbp-toolkit/common/i18next.js';
import {css, html} from 'lit-element'; import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import DBPSignatureLitElement from "./dbp-signature-lit-element"; import DBPSignatureLitElement from "./dbp-signature-lit-element";
import {PdfPreview} from "./dbp-pdf-preview"; import {PdfPreview} from "./dbp-pdf-preview";
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as utils from './utils'; import * as utils from './utils';
import {Button, Icon, MiniSpinner} from 'dbp-common'; import {Button, Icon, MiniSpinner} from '@dbp-toolkit/common';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import {classMap} from 'lit-html/directives/class-map.js'; import {classMap} from 'lit-html/directives/class-map.js';
import {FileSource} from 'dbp-file-handling'; import {FileSource} from '@dbp-toolkit/file-handling';
import JSONLD from "dbp-common/jsonld"; import JSONLD from "@dbp-toolkit/common/jsonld";
import {TextSwitch} from './textswitch.js'; import {TextSwitch} from './textswitch.js';
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL'; import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL'; import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
import nextcloudName from 'consts:nextcloudName'; import nextcloudName from 'consts:nextcloudName';
import {FileSink} from "dbp-file-handling"; import {FileSink} from "@dbp-toolkit/file-handling";
import {name as pkgName} from './../package.json';
const i18n = createI18nInstance(); const i18n = createI18nInstance();
...@@ -864,7 +865,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle ...@@ -864,7 +865,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
} }
render() { render() {
const placeholderUrl = commonUtils.getAssetURL('local/dbp-signature/qualified-signature-placeholder.png'); const placeholderUrl = commonUtils.getAssetURL(pkgName, 'qualified-signature-placeholder.png');
return html` return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}"> <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
......
import {LitElement} from "lit-element"; import {LitElement} from "lit-element";
import {EventBus} from 'dbp-common'; import {EventBus} from '@dbp-toolkit/common';
import buildinfo from 'consts:buildinfo'; import buildinfo from 'consts:buildinfo';
import * as utils from "./utils"; import * as utils from "./utils";
......
import {createI18nInstance} from './i18n.js'; import {createI18nInstance} from './i18n.js';
import {humanFileSize} from 'dbp-common/i18next.js'; import {humanFileSize} from '@dbp-toolkit/common/i18next.js';
import {css, html} from 'lit-element'; import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import DBPSignatureLitElement from "./dbp-signature-lit-element"; import DBPSignatureLitElement from "./dbp-signature-lit-element";
import {PdfPreview} from "./dbp-pdf-preview"; import {PdfPreview} from "./dbp-pdf-preview";
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import {Icon, MiniSpinner, Button} from 'dbp-common'; import {Icon, MiniSpinner, Button} from '@dbp-toolkit/common';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
import {classMap} from 'lit-html/directives/class-map.js'; import {classMap} from 'lit-html/directives/class-map.js';
import {FileSource} from 'dbp-file-handling'; import {FileSource} from '@dbp-toolkit/file-handling';
import JSONLD from "dbp-common/jsonld"; import JSONLD from "@dbp-toolkit/common/jsonld";
import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL'; import nextcloudWebAppPasswordURL from 'consts:nextcloudWebAppPasswordURL';
import nextcloudWebDavURL from 'consts:nextcloudWebDavURL'; import nextcloudWebDavURL from 'consts:nextcloudWebDavURL';
import nextcloudName from 'consts:nextcloudName'; import nextcloudName from 'consts:nextcloudName';
import {name as pkgName} from './../package.json';
const i18n = createI18nInstance(); const i18n = createI18nInstance();
...@@ -674,7 +675,7 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme ...@@ -674,7 +675,7 @@ class SignatureVerificationFull extends ScopedElementsMixin(DBPSignatureLitEleme
} }
render() { render() {
const placeholderUrl = commonUtils.getAssetURL('local/dbp-signature/official-signature-placeholder.png'); const placeholderUrl = commonUtils.getAssetURL(pkgName, 'official-signature-placeholder.png');
return html` return html`
<div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}"> <div class="${classMap({hidden: !this.isLoggedIn() || !this.hasSignaturePermissions() || this.isLoading()})}">
......
...@@ -2,8 +2,8 @@ import {createI18nInstance} from './i18n.js'; ...@@ -2,8 +2,8 @@ import {createI18nInstance} from './i18n.js';
import {css, html} from 'lit-element'; import {css, html} from 'lit-element';
import {ScopedElementsMixin} from '@open-wc/scoped-elements'; import {ScopedElementsMixin} from '@open-wc/scoped-elements';
import DBPSignatureLitElement from "./dbp-signature-lit-element"; import DBPSignatureLitElement from "./dbp-signature-lit-element";
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
const i18n = createI18nInstance(); const i18n = createI18nInstance();
......
import {AppShell} from 'dbp-app-shell'; import {AppShell} from '@dbp-toolkit/app-shell';
import * as commonUtils from 'dbp-common/utils'; import * as commonUtils from '@dbp-toolkit/common/utils';
commonUtils.defineCustomElement('dbp-signature', AppShell); commonUtils.defineCustomElement('dbp-signature', AppShell);
\ No newline at end of file
import {createInstance} from 'dbp-common/i18next.js'; import {createInstance} from '@dbp-toolkit/common/i18next.js';
import de from './i18n/de/translation.json'; import de from './i18n/de/translation.json';
import en from './i18n/en/translation.json'; import en from './i18n/en/translation.json';
......
import {html, LitElement, css} from 'lit-element'; import {html, LitElement, css} from 'lit-element';
import * as commonStyles from 'dbp-common/styles'; import * as commonStyles from '@dbp-toolkit/common/styles';
const BUTTON1 = "button1"; const BUTTON1 = "button1";
const BUTTON2 = "button2"; const BUTTON2 = "button2";
......
Subproject commit 4a73625abcfe9109486d78f7a264d2a758aa7ba7 Subproject commit f2dd39fe20fb0056acef97837a5216ea88d6ffa6
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment