From 37081db993c9807253af472bcc14278d5034c4b4 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 23 Sep 2019 14:57:04 +0200
Subject: [PATCH] Use getAssetURL from common
---
packages/data-table-view/assets/index.html | 4 +---
packages/data-table-view/src/data-table-view.js | 8 ++++----
packages/data-table-view/src/demo.js | 4 ++--
packages/data-table-view/src/utils.js | 10 ----------
packages/data-table-view/vendor/auth | 2 +-
packages/data-table-view/vendor/common | 2 +-
6 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/packages/data-table-view/assets/index.html b/packages/data-table-view/assets/index.html
index 7e1beb4e..9ea51a4c 100644
--- a/packages/data-table-view/assets/index.html
+++ b/packages/data-table-view/assets/index.html
@@ -3,9 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
- <script nomodule src="local/vpu-data-table-view/nomodule.js"></script>
- <script type="module" src="local/vpu-data-table-view/spinner.js"></script>
- <script type="module" id="vpu-library-app-src" src="vpu-data-table-view.js"></script>
+ <script type="module" id="vpu-data-table-view-src" src="vpu-data-table-view.js"></script>
</head>
<body>
diff --git a/packages/data-table-view/src/data-table-view.js b/packages/data-table-view/src/data-table-view.js
index 6ad3689b..3bff7bbc 100644
--- a/packages/data-table-view/src/data-table-view.js
+++ b/packages/data-table-view/src/data-table-view.js
@@ -8,7 +8,6 @@ import de from '../assets/datatables/i18n/German';
import en from '../assets/datatables/i18n/English';
import * as commonUtils from 'vpu-common/utils';
-import {getAssetURL} from "./utils";
import * as utils from "./utils";
import bulmaCSSPath from "bulma/css/bulma.min.css";
@@ -112,9 +111,10 @@ class DataTableView extends LitElement {
}
render() {
- const bulmaCSS = utils.getAssetURL(bulmaCSSPath);
- let dt_css = getAssetURL('local/vpu-data-table-view/css/jquery.dataTables.min.css');
- let rs_css = getAssetURL('local/vpu-data-table-view/css/responsive.dataTables.css');
+ commonUtils.initAssetBaseURL('vpu-data-table-view-src');
+ const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
+ let dt_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/jquery.dataTables.min.css');
+ let rs_css = commonUtils.getAssetURL('local/vpu-data-table-view/css/responsive.dataTables.css');
return html`
<link rel="stylesheet" href="${bulmaCSS}">
diff --git a/packages/data-table-view/src/demo.js b/packages/data-table-view/src/demo.js
index f2eed283..7694ee33 100644
--- a/packages/data-table-view/src/demo.js
+++ b/packages/data-table-view/src/demo.js
@@ -5,7 +5,6 @@ import {i18n} from './i18n';
import {html, LitElement} from 'lit-element';
import * as commonUtils from 'vpu-common/utils';
import bulmaCSSPath from "bulma/css/bulma.min.css";
-import * as utils from "./utils";
class DataTableViewDemo extends LitElement {
constructor() {
@@ -96,7 +95,8 @@ class DataTableViewDemo extends LitElement {
}
render() {
- const bulmaCSS = utils.getAssetURL(bulmaCSSPath);
+ commonUtils.initAssetBaseURL('vpu-data-table-view-src');
+ const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath);
return html`
<link rel="stylesheet" href="${bulmaCSS}">
<style>
diff --git a/packages/data-table-view/src/utils.js b/packages/data-table-view/src/utils.js
index 4d1384a4..9fb5d57d 100644
--- a/packages/data-table-view/src/utils.js
+++ b/packages/data-table-view/src/utils.js
@@ -1,15 +1,5 @@
import vars from './vars.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;
-}
-
export const getAPiUrl = function(path = "", withPrefix = true) {
return vars.apiBaseUrl + (withPrefix ? vars.apiUrlPrefix : "") + path;
}
diff --git a/packages/data-table-view/vendor/auth b/packages/data-table-view/vendor/auth
index 33f040f4..32b3c1e2 160000
--- a/packages/data-table-view/vendor/auth
+++ b/packages/data-table-view/vendor/auth
@@ -1 +1 @@
-Subproject commit 33f040f4a2cedef5ea468f88dbd93210277bb67e
+Subproject commit 32b3c1e27e0f2d542576cce65d370208ddd95de0
diff --git a/packages/data-table-view/vendor/common b/packages/data-table-view/vendor/common
index 5e3da6e2..adbdf637 160000
--- a/packages/data-table-view/vendor/common
+++ b/packages/data-table-view/vendor/common
@@ -1 +1 @@
-Subproject commit 5e3da6e22fd0d14b95fbc032d385c020ae47fba7
+Subproject commit adbdf63736ba48eaf93ca06f83ee3652b7f85f12
--
GitLab