Use getAssetURL() from common

8bfccaa8 · Reiter, Christoph · 3b11e5b9 · 8bfccaa8 · 8bfccaa8 · 8bfccaa8
Commit 8bfccaa8 authored 5 years ago by Reiter, Christoph
--- 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>

--- 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}">


--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
 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}">

--- a/packages/person-select/src/utils.js
+++ b/packages/person-select/src/utils.js
-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

--- a/auth @ 32b3c1e2
+++ b/auth @ 32b3c1e2
-Subproject commit fd7e46df47782d2f4438ed81aff7bfc7f5ddf1d9
+Subproject commit 32b3c1e27e0f2d542576cce65d370208ddd95de0
--- a/common @ adbdf637
+++ b/common @ adbdf637
-Subproject commit 06dc2079ed19d9ae4762f89dd9eaaec9911b2b13
+Subproject commit adbdf63736ba48eaf93ca06f83ee3652b7f85f12