From 96360741156bdf7a4ed9dd665116b463155426a9 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 23 Sep 2019 14:50:41 +0200
Subject: [PATCH] Use getAssetURL from common
---
.../assets/index.html | 2 +-
.../knowledge-base-web-page-element-view/src/demo.js | 4 ++--
.../knowledge-base-web-page-element-view/src/utils.js | 9 ---------
.../src/vpu-kb-wpe-view.js | 5 ++---
.../knowledge-base-web-page-element-view/vendor/auth | 2 +-
.../knowledge-base-web-page-element-view/vendor/common | 2 +-
6 files changed, 7 insertions(+), 17 deletions(-)
delete mode 100644 packages/knowledge-base-web-page-element-view/src/utils.js
diff --git a/packages/knowledge-base-web-page-element-view/assets/index.html b/packages/knowledge-base-web-page-element-view/assets/index.html
index ad12e30e..82dd3bf5 100644
--- a/packages/knowledge-base-web-page-element-view/assets/index.html
+++ b/packages/knowledge-base-web-page-element-view/assets/index.html
@@ -2,7 +2,7 @@
<html>
<head>
<meta charset="UTF-8">
- <script type="module" id="vpu-knowledge-base-web-page-element-view-wc-src" src="bundle.js"></script>
+ <script type="module" id="vpu-knowledge-base-web-page-element-view-src" src="bundle.js"></script>
</head>
<style>
vpu-knowledge-base-web-page-element-view-demo {
diff --git a/packages/knowledge-base-web-page-element-view/src/demo.js b/packages/knowledge-base-web-page-element-view/src/demo.js
index 8f60cbf7..766f0832 100644
--- a/packages/knowledge-base-web-page-element-view/src/demo.js
+++ b/packages/knowledge-base-web-page-element-view/src/demo.js
@@ -4,7 +4,6 @@ import 'vpu-auth';
import './vpu-kb-wpe-view';
import * as commonUtils from 'vpu-common/utils';
import bulmaCSSPath from "bulma/css/bulma.min.css";
-import * as utils from "./utils";
class KnowledgeBaseWebPageElementViewDemo extends LitElement {
constructor() {
@@ -29,7 +28,8 @@ class KnowledgeBaseWebPageElementViewDemo extends LitElement {
}
render() {
- const bulmaCSS = utils.getAssetURL(bulmaCSSPath);
+ commonUtils.initAssetBaseURL('vpu-knowledge-base-web-page-element-view-src');
+ const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
return html`
<link rel="stylesheet" href="${bulmaCSS}">
<style>
diff --git a/packages/knowledge-base-web-page-element-view/src/utils.js b/packages/knowledge-base-web-page-element-view/src/utils.js
deleted file mode 100644
index d6191ebb..00000000
--- a/packages/knowledge-base-web-page-element-view/src/utils.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const getAssetURL = (path) => {
- const elm = document.getElementById('vpu-knowledge-base-web-page-element-view-wc-src');
- if (!elm)
- return path;
- const url = elm.src;
- // newer browsers only
- //var url = import.meta.url;
- return new URL(path, url).href;
-};
diff --git a/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js b/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
index 28f9cec2..8e437b4e 100644
--- a/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
+++ b/packages/knowledge-base-web-page-element-view/src/vpu-kb-wpe-view.js
@@ -6,7 +6,6 @@ import "vpu-common/vpu-mini-spinner.js";
import * as commonUtils from "vpu-common/utils";
import {unsafeHTML} from 'lit-html/directives/unsafe-html.js';
import bulmaCSSPath from "bulma/css/bulma.min.css";
-import * as utils from "./utils";
/**
* KnowledgeBaseWebPageElementView web component
@@ -156,8 +155,8 @@ class VPUKnowledgeBaseWebPageElementView extends VPULitElement {
}
render() {
- //<link rel="stylesheet" href="${this.css}">
- const bulmaCSS = utils.getAssetURL(bulmaCSSPath);
+ commonUtils.initAssetBaseURL('vpu-knowledge-base-web-page-element-view-src');
+ const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
return html`
<link rel="stylesheet" href="${bulmaCSS}">
<style>
diff --git a/packages/knowledge-base-web-page-element-view/vendor/auth b/packages/knowledge-base-web-page-element-view/vendor/auth
index 33f040f4..32b3c1e2 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/auth
+++ b/packages/knowledge-base-web-page-element-view/vendor/auth
@@ -1 +1 @@
-Subproject commit 33f040f4a2cedef5ea468f88dbd93210277bb67e
+Subproject commit 32b3c1e27e0f2d542576cce65d370208ddd95de0
diff --git a/packages/knowledge-base-web-page-element-view/vendor/common b/packages/knowledge-base-web-page-element-view/vendor/common
index 5e3da6e2..adbdf637 160000
--- a/packages/knowledge-base-web-page-element-view/vendor/common
+++ b/packages/knowledge-base-web-page-element-view/vendor/common
@@ -1 +1 @@
-Subproject commit 5e3da6e22fd0d14b95fbc032d385c020ae47fba7
+Subproject commit adbdf63736ba48eaf93ca06f83ee3652b7f85f12
--
GitLab