Use getAssetURL() from common

cab6c3f0 · Reiter, Christoph · c1d34613 · cab6c3f0 · c1d34613 · cab6c3f0
Commit cab6c3f0 authored 5 years ago by Reiter, Christoph
--- a/packages/auth/assets/index.html
+++ b/packages/auth/assets/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
    <meta charset="UTF-8">
-    <script type="module" id="vpu-auth-wc-src" src="bundle.js"></script>
+    <script type="module" id="vpu-auth-src" src="bundle.js"></script>
 </head>

 <body>

--- a/packages/auth/src/utils.js
+++ b/packages/auth/src/utils.js
-export const getAssetURL = (path) => {
-    const elm = document.getElementById('vpu-library-app-src');
-    if (!elm)
-        return path;
-    const url = elm.src;
-    // newer browsers only
-    //var url = import.meta.url;
-    return new URL(path, url).href;
-};
--- a/packages/auth/src/vpu-auth-demo.js
+++ b/packages/auth/src/vpu-auth-demo.js
@@ -3,7 +3,6 @@ import {html, LitElement} from 'lit-element';
 import './vpu-auth';
 import * as commonUtils from 'vpu-common/utils';
 import bulmaCSSPath from "bulma/css/bulma.min.css";
-import * as utils from "./utils";

 class AuthDemo extends LitElement {
    constructor() {
@@ -28,7 +27,8 @@ class AuthDemo extends LitElement {
    }

    render() {
-        const bulmaCSS = utils.getAssetURL(bulmaCSSPath);
+        commonUtils.initAssetBaseURL('vpu-auth-src');
+        const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
        return html`
            <link rel="stylesheet" href="${bulmaCSS}">


--- a/packages/auth/src/vpu-auth.js
+++ b/packages/auth/src/vpu-auth.js
@@ -4,7 +4,6 @@ import JSONLD from 'vpu-common/jsonld'
 import * as commonUtils from 'vpu-common/utils';
 import 'vpu-common/vpu-icon.js';
 import bulmaCSSPath from "bulma/css/bulma.min.css";
-import * as utils from "./utils";

 /**
 * Keycloak auth web component
@@ -298,7 +297,8 @@ class VPUAuth extends LitElement {
    }

    render() {
-        const bulmaCSS = utils.getAssetURL(bulmaCSSPath);
+        commonUtils.initAssetBaseURL('vpu-auth-src');
+        const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
        return html`
            <link rel="stylesheet" href="${bulmaCSS}">


--- a/common @ adbdf637
+++ b/common @ adbdf637
-Subproject commit 91947464b55c79c5b0aa2188f512e08ebc0be612
+Subproject commit adbdf63736ba48eaf93ca06f83ee3652b7f85f12