Skip to content
Snippets Groups Projects
Unverified Commit e61fe01d authored by Bekerle, Patrizio's avatar Bekerle, Patrizio :fire:
Browse files

Remove dbp-language-changed event and use dbp-set-property event for "lang"

parent 69ecf513
No related branches found
No related tags found
No related merge requests found
Pipeline #16528 failed
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
packages/app-shell/src/app-shell.js
+ 7
− 7
View file @ e61fe01d
...@@ -297,12 +297,8 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) { ...@@ -297,12 +297,8 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
this.lang = lang; this.lang = lang;
this.router.update(); this.router.update();
const event = new CustomEvent("dbp-language-changed", { // tell a dbp-provider to update the "lang" property
bubbles: true, this.sendSetPropertyEvent('lang', lang);
detail: {'lang': lang}
});
this.dispatchEvent(event);
} }
} }
...@@ -312,6 +308,10 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) { ...@@ -312,6 +308,10 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
// For screen readers // For screen readers
document.documentElement.setAttribute("lang", this.lang); document.documentElement.setAttribute("lang", this.lang);
i18n.changeLanguage(this.lang); i18n.changeLanguage(this.lang);
this.router.update();
this.subtitle = this.activeMetaDataText("short_name");
this.description = this.activeMetaDataText("description");
} }
}); });
...@@ -822,7 +822,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) { ...@@ -822,7 +822,7 @@ export class AppShell extends ScopedElementsMixin(AdapterLitElement) {
<dbp-notification lang="${this.lang}"></dbp-notification> <dbp-notification lang="${this.lang}"></dbp-notification>
<header> <header>
<div class="hd1-left"> <div class="hd1-left">
<dbp-language-select @dbp-language-changed=${this.onLanguageChanged.bind(this)}></dbp-language-select> <dbp-language-select subscribe="lang"></dbp-language-select>
</div> </div>
<div class="hd1-middle"> <div class="hd1-middle">
</div> </div>
......
packages/language-select/src/language-select.js
+ 0
− 23
View file @ e61fe01d
...@@ -13,8 +13,6 @@ export class LanguageSelect extends AdapterLitElement { ...@@ -13,8 +13,6 @@ export class LanguageSelect extends AdapterLitElement {
this._lang = 'de'; this._lang = 'de';
this.languages = ['de', 'en']; this.languages = ['de', 'en'];
this.onExternalChange = this.onExternalChange.bind(this);
// for the i18next scanner // for the i18next scanner
i18n.t('de'); i18n.t('de');
i18n.t('de-action'); i18n.t('de-action');
...@@ -54,13 +52,6 @@ export class LanguageSelect extends AdapterLitElement { ...@@ -54,13 +52,6 @@ export class LanguageSelect extends AdapterLitElement {
this.requestUpdate('next', oldNext); this.requestUpdate('next', oldNext);
if (oldValue !== value) { if (oldValue !== value) {
let event = new CustomEvent("dbp-language-changed", {
bubbles: true,
composed: true,
detail: {'lang': value}
});
this.dispatchEvent(event);
// tell a dbp-provider to update the "lang" property // tell a dbp-provider to update the "lang" property
this.sendSetPropertyEvent('lang', value); this.sendSetPropertyEvent('lang', value);
...@@ -109,20 +100,6 @@ export class LanguageSelect extends AdapterLitElement { ...@@ -109,20 +100,6 @@ export class LanguageSelect extends AdapterLitElement {
]; ];
} }
onExternalChange(e) {
this.lang = e.detail.lang;
}
connectedCallback() {
super.connectedCallback();
window.addEventListener('dbp-language-changed', this.onExternalChange);
}
disconnectedCallback() {
document.removeEventListener('dbp-language-changed', this.onExternalChange);
super.disconnectedCallback();
}
onClick(e) { onClick(e) {
e.preventDefault(); e.preventDefault();
this.lang = this.next; this.lang = this.next;
......
packages/provider/src/adapter-lit-element.js
+ 2
− 0
View file @ e61fe01d
...@@ -302,6 +302,8 @@ export class AdapterLitElement extends LitElement { ...@@ -302,6 +302,8 @@ export class AdapterLitElement extends LitElement {
* @returns {boolean} * @returns {boolean}
*/ */
sendSetPropertyEvent(name, value) { sendSetPropertyEvent(name, value) {
// console.log("dbp-set-property", name, value);
const event = new CustomEvent('dbp-set-property', { const event = new CustomEvent('dbp-set-property', {
bubbles: true, bubbles: true,
composed: true, composed: true,
......
toolkit-showcase/assets/dbp-toolkit-showcase.html.ejs
+ 2
− 1
View file @ e61fe01d
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<body> <body>
<dbp-provider id="root" <dbp-provider id="root"
lang="en" entry-point-url="<%= entryPointURL %>" entry-point-url="<%= entryPointURL %>"
nextcloud-auth-url="<%= nextcloudWebAppPasswordURL %>" nextcloud-auth-url="<%= nextcloudWebAppPasswordURL %>"
nextcloud-web-dav-url="<%= nextcloudWebDavURL %>" nextcloud-web-dav-url="<%= nextcloudWebDavURL %>"
nextcloud-name="<%= nextcloudName %>" nextcloud-name="<%= nextcloudName %>"
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<<%= name %> <<%= name %>
src="<%= getUrl(name + '.topic.metadata.json') %>" src="<%= getUrl(name + '.topic.metadata.json') %>"
auth auth
lang="en"
base-path="<%= getUrl('') %>" base-path="<%= getUrl('') %>"
keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}' keycloak-config='{"url": "<%= keyCloakBaseURL %>", "realm": "tugraz", "clientId": "<%= keyCloakClientId %>", "silentCheckSsoRedirectUri": "<%= getUrl('silent-check-sso.html') %>"}'
matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>" matomo-url="<%= matomoUrl %>" matomo-site-id="<%= matomoSiteId %>"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment