diff --git a/packages/person-select/assets/index.html b/packages/person-select/assets/index.html index 3af06a9b0d216e9f80f64fc06f36c5969805f1fe..07aa88180f84e0c788936e2ffae45b576d6b3b69 100644 --- a/packages/person-select/assets/index.html +++ b/packages/person-select/assets/index.html @@ -2,7 +2,7 @@ <html> <head> <meta charset="UTF-8"> - <script type="module" id="vpu-person-select-wc-src" src="vpu-person-select.js"></script> + <script type="module" id="vpu-person-select-src" src="vpu-person-select.js"></script> </head> <body> diff --git a/packages/person-select/src/person-select-demo.js b/packages/person-select/src/person-select-demo.js index a68d02597d56318f82b8290c239b8056dc1c7371..649c76b7c7485698c25f3c4aa39705001701ea83 100644 --- a/packages/person-select/src/person-select-demo.js +++ b/packages/person-select/src/person-select-demo.js @@ -3,7 +3,6 @@ import {html, LitElement} from 'lit-element'; import './person-select.js'; import * as commonUtils from 'vpu-common/utils'; import bulmaCSSPath from "bulma/css/bulma.min.css"; -import {getAssetURL} from "./utils"; class PersonSelectDemo extends LitElement { constructor() { @@ -26,7 +25,8 @@ class PersonSelectDemo extends LitElement { } render() { - const bulmaCSS = getAssetURL(bulmaCSSPath); + commonUtils.initAssetBaseURL('vpu-person-select-src'); + const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath); return html` <link rel="stylesheet" href="${bulmaCSS}"> diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js index 66512039085bed027faee34a7b7989e5fd709f8e..94a465d9cf16a993fc8a6a9e217db21218fbfa88 100644 --- a/packages/person-select/src/person-select.js +++ b/packages/person-select/src/person-select.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import {getAssetURL, findObjectInApiResults} from './utils.js'; +import {findObjectInApiResults} from './utils.js'; import select2 from 'select2'; import select2LangDe from './i18n/de/select2' import select2LangEn from './i18n/en/select2' @@ -205,8 +205,9 @@ class PersonSelect extends VPULitElementJQuery { } render() { - const select2CSS = getAssetURL(select2CSSPath); - const bulmaCSS = getAssetURL(bulmaCSSPath); + commonUtils.initAssetBaseURL('vpu-person-select-src'); + const select2CSS = commonUtils.getAssetURL(select2CSSPath); + const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath); return html` <link rel="stylesheet" href="${bulmaCSS}"> <link rel="stylesheet" href="${select2CSS}"> diff --git a/packages/person-select/src/utils.js b/packages/person-select/src/utils.js index ffa65251ebd049880c9271e990ebea64c6dbebce..97d072d913ec7441ed76a704dc8658458ca0773b 100644 --- a/packages/person-select/src/utils.js +++ b/packages/person-select/src/utils.js @@ -1,12 +1,3 @@ -export const getAssetURL = (path) => { - const elm = document.getElementById('vpu-library-shelving-wc-src'); - if (!elm) - return path; - const url = elm.src; - // newer browsers only - //var url = import.meta.url; - return new URL(path, url).href; -}; /** * Finds an object in a JSON result by identifier diff --git a/packages/person-select/vendor/auth b/packages/person-select/vendor/auth index fd7e46df47782d2f4438ed81aff7bfc7f5ddf1d9..32b3c1e27e0f2d542576cce65d370208ddd95de0 160000 --- a/packages/person-select/vendor/auth +++ b/packages/person-select/vendor/auth @@ -1 +1 @@ -Subproject commit fd7e46df47782d2f4438ed81aff7bfc7f5ddf1d9 +Subproject commit 32b3c1e27e0f2d542576cce65d370208ddd95de0 diff --git a/packages/person-select/vendor/common b/packages/person-select/vendor/common index 06dc2079ed19d9ae4762f89dd9eaaec9911b2b13..adbdf63736ba48eaf93ca06f83ee3652b7f85f12 160000 --- a/packages/person-select/vendor/common +++ b/packages/person-select/vendor/common @@ -1 +1 @@ -Subproject commit 06dc2079ed19d9ae4762f89dd9eaaec9911b2b13 +Subproject commit adbdf63736ba48eaf93ca06f83ee3652b7f85f12