diff --git a/packages/app-shell/assets/example.topic.metadata.json b/packages/app-shell/assets/example.topic.metadata.json
index b50437bc69243a6b14ba37b79ea8364b37304a22..108e6eba66a0aea606ecc3447f471bf106a90766 100644
--- a/packages/app-shell/assets/example.topic.metadata.json
+++ b/packages/app-shell/assets/example.topic.metadata.json
@@ -13,7 +13,8 @@
},
"routing_name": "example",
"activities": [
- {"path": "example.metadata.json"}
+ {"path": "example.metadata.json"},
+ {"path": "example2.metadata.json"}
],
"attributes": []
}
\ No newline at end of file
diff --git a/packages/app-shell/assets/example2.metadata.json b/packages/app-shell/assets/example2.metadata.json
new file mode 100644
index 0000000000000000000000000000000000000000..e91d28073c6dcb22940d165a7503b5c4684f54f1
--- /dev/null
+++ b/packages/app-shell/assets/example2.metadata.json
@@ -0,0 +1,17 @@
+{
+ "element": "dbp-activity-example",
+ "module_src": "dbp-activity-example.js",
+ "routing_name": "activity-example2",
+ "name": {
+ "de": "Beispielaktivität 2",
+ "en": "Example Activity 2"
+ },
+ "short_name": {
+ "de": "Beispielaktivität 2",
+ "en": "Example Activity 2"
+ },
+ "description": {
+ "de": "Eine Beschreibung",
+ "en": "A Description"
+ }
+}
diff --git a/packages/app-shell/package.json b/packages/app-shell/package.json
index beb288b08207de469835941e8f6427d8352dba43..05a3426f1021e7a04cd8311a424b647c43d7ba02 100644
--- a/packages/app-shell/package.json
+++ b/packages/app-shell/package.json
@@ -45,7 +45,7 @@
"watch": "npm run watch-local",
"watch-local": "rollup -c --watch",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true",
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true",
"lint": "eslint ."
}
}
diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index 4cc74fe094d02a342364cd138a5a9296e87b504b..30fa1c45641b9320b5887a50444c0a5d3a3e6785 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -65,6 +65,10 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
this.matomo = null;
this._attrObserver = new MutationObserver(this.onAttributeObserved);
+
+ this.shellName = 'TU Graz';
+ this.shellSubname= 'Graz University of Technology';
+ this.noBrand = false;
}
static get scopedElements() {
@@ -233,7 +237,10 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
_loginStatus: { type: Boolean, attribute: false },
matomoUrl: { type: String, attribute: "matomo-url" },
matomoSiteId: { type: Number, attribute: "matomo-site-id" },
- noWelcomePage: { type: Boolean, attribute: "no-welcome-page" }
+ noWelcomePage: { type: Boolean, attribute: "no-welcome-page" },
+ shellName: { type: String, attribute: "shell-name" },
+ shellSubname: { type: String, attribute: "shell-subname" },
+ noBrand: { type: Boolean, attribute: "no-brand" }
};
}
@@ -624,6 +631,12 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
aside .menu {
border-bottom: black 1px solid;
border-top-width: 0;
+ width: 100%;
+ position: absolute;
+ background-color: white;
+ z-index: 10;
+ overflow-y: scroll;
+ white-space: nowrap;
}
.menu li {
@@ -644,8 +657,6 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
ul.menu.hidden {
display: none;
}
-
-
}
`;
}
@@ -762,18 +773,17 @@ export class AppShell extends ScopedElementsMixin(LitElement) {
</div>
<div class="hd2-left">
<div class="header">
- TU Graz<br>Graz University of Technology
+ ${this.shellName}<br>${this.shellSubname}
</div>
</div>
<div class="hd2-right">
- <dbp-tugraz-logo id="main-logo" lang="${this.lang}"></dbp-tugraz-logo>
+ <dbp-tugraz-logo id="main-logo" lang="${this.lang}" class="${classMap({hidden: this.noBrand})}"></dbp-tugraz-logo>
</div>
</header>
<div id="headline">
<h1 class="title">${this.topicMetaDataText('name')}</h1>
</div>
-
<aside>
<h2 class="subtitle" @click="${this.toggleMenu}">
${this.subtitle}
diff --git a/packages/app-shell/src/dbp-activity-example.js b/packages/app-shell/src/dbp-activity-example.js
index 7f15f681655577885b19d71697fc3e48f99dfb28..850a73c289e514052d2fa347da420431a42a0a30 100644
--- a/packages/app-shell/src/dbp-activity-example.js
+++ b/packages/app-shell/src/dbp-activity-example.js
@@ -31,7 +31,8 @@ class ActivityExample extends LitElement {
render() {
return html`
- <p>${ i18n.t('activity-example.hello-world') }</p>
+ <h3>${i18n.t('activity-example.hello-world')}</h3>
+ <ul>${(Array.from(Array(100).keys())).map(i => html`<li>${i18n.t('activity-example.hello-world') + ' ' + i}</li>`)}</ul>
`;
}
}
diff --git a/packages/check-in-place-select/assets/index.html b/packages/check-in-place-select/assets/index.html
index 4926af42b043a6ed1e5784981b9282b48cb2511a..9455e915f2cb6d1022beeaa402b995d0ce3092f1 100644
--- a/packages/check-in-place-select/assets/index.html
+++ b/packages/check-in-place-select/assets/index.html
@@ -2,6 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
<script type="module" src="dbp-check-in-place-select-demo.js"></script>
</head>
diff --git a/packages/check-in-place-select/package.json b/packages/check-in-place-select/package.json
index 7dcc19a3d771f71f283a1d73018cd65699bf2885..1dd6d56e48f91b8e4dae9a93d4be179c6a0fcbbe 100644
--- a/packages/check-in-place-select/package.json
+++ b/packages/check-in-place-select/package.json
@@ -45,6 +45,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js
index b5b935da2db2f895f15ce114c106f94f75f7d2f6..d2a2594896e49ab03c178bf7b7fd5c2583b43667 100644
--- a/packages/check-in-place-select/src/check-in-place-select.js
+++ b/packages/check-in-place-select/src/check-in-place-select.js
@@ -168,6 +168,8 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(LitElement) {
};
},
processResults: function (data) {
+ that.$('#check-in-place-select-dropdown').addClass('select2-bug');
+
that.lastResult = data;
let transformed = that.jsonld.transformMembers(data, checkInPlaceContext);
const results = [];
@@ -185,6 +187,8 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(LitElement) {
}
}
}).on("select2:select", function (e) {
+ that.$('#check-in-place-select-dropdown').removeClass('select2-bug');
+
// set custom element attributes
const identifier = e.params.data.id;
const maxCapacity = e.params.data.maximumPhysicalAttendeeCapacity;
@@ -356,6 +360,10 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(LitElement) {
-webkit-appearance: none;
}
+ /* https://github.com/select2/select2/issues/5457 */
+ .select2-bug .loading-results {
+ display: none !important;
+ }
`
];
}
diff --git a/packages/common/misc/browser-check.js b/packages/common/misc/browser-check.js
index 171e1044a137687e38ba8dac928f2f1c02af084a..8bd4abc1aeaec56f6ee09a29c1592911f2bb7335 100644
--- a/packages/common/misc/browser-check.js
+++ b/packages/common/misc/browser-check.js
@@ -74,6 +74,13 @@ function supportsEval() {
return true;
}
+// https://caniuse.com/abortcontroller
+function supportsAbortController() {
+ // AbortController in older Safari is broken, so check for the signal property
+ // as well.
+ return (!!window.AbortController && Request.prototype.hasOwnProperty('signal'));
+}
+
function isBrowserSupported() {
if (!supportsEval()) {
console.log("Eval support disabled, skipping browser feature detection.");
@@ -110,6 +117,11 @@ function isBrowserSupported() {
return false;
}
+ if (!supportsAbortController()) {
+ console.log("AbortController not supported");
+ return false;
+ }
+
return true;
}
diff --git a/packages/common/package.json b/packages/common/package.json
index 24105dbcbd2d27bcf14caf635dde5e40fcc3b7d4..8bdd51cda6f458dcb5626fa2f06492741779d0c8 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -29,7 +29,7 @@
"test": "npm run build-test && karma start --singleRun",
"watch": "rollup -c --watch",
"lint": "eslint .",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
},
"dependencies": {
"@open-wc/scoped-elements": "^1.3.2",
diff --git a/packages/common/src/button.js b/packages/common/src/button.js
index 1ba86734773de4a4f4b4d4b363439d2d50b0f031..14814be031ea66aa1538f3e02d2cf9a8af76d44d 100644
--- a/packages/common/src/button.js
+++ b/packages/common/src/button.js
@@ -156,7 +156,7 @@ export class LoadingButton extends ScopedElementsMixin(LitElement) {
render() {
return html`
<button class="button ${this.type} loading-container ${!this.loading ? "is-not-loading" : ""}" ?disabled="${this.disabled}">
- <div class="label"><slot>${this.value}</slot></div> <dbp-mini-spinner class="spinner" style="display: ${this.loading ? "inline" : "none"}"></dbp-mini-spinner>
+ <div class="label">${this.value}</div> <dbp-mini-spinner class="spinner" style="display: ${this.loading ? "inline" : "none"}"></dbp-mini-spinner>
</button>
`;
}
diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json
index 9a8a0503c8ebd49d5c3714d916fcc72893957f0e..e290527a08f8eff97c14c532947de95506b89768 100644
--- a/packages/data-table-view/package.json
+++ b/packages/data-table-view/package.json
@@ -51,6 +51,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/file-handling/package.json b/packages/file-handling/package.json
index 3efca2069e203041a0f48e3f73e3fd68172cfec0..d110b4721ac20b5f2c91321ad1d1e982c3e25a50 100644
--- a/packages/file-handling/package.json
+++ b/packages/file-handling/package.json
@@ -1,6 +1,6 @@
{
"name": "@dbp-toolkit/file-handling",
- "version": "0.1.6",
+ "version": "0.1.5",
"main": "src/index.js",
"license": "LGPL-2.1-or-later",
"devDependencies": {
@@ -46,6 +46,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json
index 63cd8d8c8a54025a84f1618614636b06f5e20d6f..afa3acf156aa2cee93db2e8c3be35ce1cef0f396 100644
--- a/packages/knowledge-base-web-page-element-view/package.json
+++ b/packages/knowledge-base-web-page-element-view/package.json
@@ -44,6 +44,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/language-select/package.json b/packages/language-select/package.json
index 66ceb5b2f74a3ffad227d0dde894da47944c295b..a8332ac2c0462a0b1ac937997aeeacf8d5846529 100644
--- a/packages/language-select/package.json
+++ b/packages/language-select/package.json
@@ -40,6 +40,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/notification/package.json b/packages/notification/package.json
index b9d2a2ecf1a79f5a6ac1116fc48056d4d08ab5fe..364beaf6191f8185ce3ddb3401aa2a0407dfc0cc 100644
--- a/packages/notification/package.json
+++ b/packages/notification/package.json
@@ -41,6 +41,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/person-profile/package.json b/packages/person-profile/package.json
index 678a116b0f00bec715f6176a1e173078750959cf..2101c5716d4d1957dd901366835798a613d8570a 100644
--- a/packages/person-profile/package.json
+++ b/packages/person-profile/package.json
@@ -44,6 +44,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/person-select/package.json b/packages/person-select/package.json
index 3ceefb4dd6d30af54be7adb26dcf45a1c70a9895..ab4ee3f9c02f62cb58d2e43287507701151f26c6 100644
--- a/packages/person-select/package.json
+++ b/packages/person-select/package.json
@@ -45,6 +45,6 @@
"watch-local": "rollup -c --watch",
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}
diff --git a/packages/qr-code-scanner/package.json b/packages/qr-code-scanner/package.json
index bbfd83f3b4f7f74b09066a05401158ff1af3e93c..0da40e15a6d58f965cb9c70cc13bbcab70ba5905 100644
--- a/packages/qr-code-scanner/package.json
+++ b/packages/qr-code-scanner/package.json
@@ -47,6 +47,6 @@
"watch-dev": "rollup -c --watch --environment BUILD:development",
"test": "npm run build-test && karma start --singleRun",
"lint": "eslint .",
- "publish": "can-npm-publish --verbose && npm run build && echo 'Todo: Publish' || true"
+ "publish": "can-npm-publish --verbose 2>&1 && npm run build && echo 'Todo: Publish' || true"
}
}