diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js index 9c0d66d5a00d1f1eb6c076fbe0417ccda0d03e69..495bf6c64cd4e8f5e77a5212ac720ce9aeac116e 100644 --- a/packages/auth/src/auth-keycloak.js +++ b/packages/auth/src/auth-keycloak.js @@ -117,7 +117,7 @@ export class AuthKeycloak extends AdapterLitElement { const that = this; if (newPerson && this.loadPerson) { - JSONLD.initialize(this.entryPointUrl, (jsonld) => { + JSONLD.getInstance(this.entryPointUrl).then((jsonld) => { // find the correct api url for the current person // we are fetching the logged-in person directly to respect the REST philosophy // see: https://github.com/api-platform/api-platform/issues/337 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 f9c721d4596f327bbc6689564e70d163f4daf421..7b63bb9af29270fa28dc8f3ac5c9d16a97932771 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 @@ -117,7 +117,7 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) { initJSONLD(ignorePreset = false) { const that = this; - JSONLD.initialize(this.entryPointUrl, function (jsonld) { + JSONLD.getInstance(this.entryPointUrl).then(function (jsonld) { that.jsonld = jsonld; that.active = true; diff --git a/packages/common/jsonld.js b/packages/common/jsonld.js index 2b0cb4ddc19102fe656b756db31060ec94307261..f56552b0b942b343f2b4fd0ea3023e41d32864a2 100644 --- a/packages/common/jsonld.js +++ b/packages/common/jsonld.js @@ -20,7 +20,7 @@ export default class JSONLD { let promise = JSONLD.promises[apiUrl]; if (promise === undefined) { promise = new Promise((resolve, reject) => { - JSONLD.initialize( + JSONLD._initialize( apiUrl, (instance) => resolve(instance), (error) => reject(error), @@ -33,6 +33,16 @@ export default class JSONLD { } static initialize(apiUrl, successFnc, failureFnc, lang = 'de') { + console.warn('DEPRECATED: JSONLD.initialize(), use JSONLD.getInstance() instead'); + JSONLD._initialize(apiUrl, successFnc, failureFnc, lang); + } + + static doInitializationOnce(apiUrl) { + // No longer needed, remove any calls + console.warn('DEPRECATED: JSONLD.doInitializationOnce() calls can be removed'); + } + + static _initialize(apiUrl, successFnc, failureFnc, lang = 'de') { if (lang !== 'de') { i18n.changeLanguage(lang); } @@ -60,10 +70,6 @@ export default class JSONLD { JSONLD._doInitialization(apiUrl); } - static doInitializationOnce(apiUrl) { - // No longer needed, remove any calls - } - static _doInitialization(apiUrl) { const xhr = new XMLHttpRequest(); xhr.open("GET", apiUrl, true); diff --git a/packages/organization-select/src/organization-select.js b/packages/organization-select/src/organization-select.js index 2c9967c282c22ac540e1f6c5ad9ee58408a5aa95..ee212b9d54c2f1051e4e3392968da41f10f2fa64 100644 --- a/packages/organization-select/src/organization-select.js +++ b/packages/organization-select/src/organization-select.js @@ -194,7 +194,7 @@ export class OrganizationSelect extends AdapterLitElement { break; } case "entryPointUrl": - JSONLD.initialize(this.entryPointUrl, (jsonld) => { + JSONLD.getInstance(this.entryPointUrl).then((jsonld) => { this.jsonld = jsonld; }, {}, this.lang); break; diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js index 8a3fe9c3e1889dd412b687580a4eeea1bd2d7f79..c8118ba5b4e7647664e2b81b7f8fc9c2ddc82356 100644 --- a/packages/person-profile/src/person-profile.js +++ b/packages/person-profile/src/person-profile.js @@ -45,7 +45,7 @@ export class PersonProfile extends DBPLitElement { case "entryPointUrl": { const that = this; - JSONLD.initialize(this.entryPointUrl, function (jsonld) { + JSONLD.getInstance(this.entryPointUrl).then(function (jsonld) { that.jsonld = jsonld; }, {}, that.lang); break; diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js index 9c309be81e7c6cbb2800cf75fe3a6f0ff74bbde4..bbaf34b3067b8fa9217834292808492e4e69c434 100644 --- a/packages/person-select/src/person-select.js +++ b/packages/person-select/src/person-select.js @@ -108,7 +108,7 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) { initJSONLD(ignorePreset = false) { const that = this; - JSONLD.initialize(this.entryPointUrl, function (jsonld) { + JSONLD.getInstance(this.entryPointUrl).then(function (jsonld) { that.jsonld = jsonld; that.active = that.authenticated();