From b361381302923ac810ba7ed87acf59da06604f22 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 23 Apr 2020 11:46:53 +0200
Subject: [PATCH] Fix some leftover non-scoped elements
---
packages/person-profile/src/demo.js | 1 -
packages/person-profile/src/person-profile.js | 2 --
packages/person-profile/src/vpu-person-profile-demo.js | 6 +++---
packages/person-profile/test/unit.js | 2 +-
packages/person-profile/vendor/auth | 2 +-
packages/person-profile/vendor/common | 2 +-
packages/person-profile/vendor/person-select | 2 +-
7 files changed, 7 insertions(+), 10 deletions(-)
delete mode 100644 packages/person-profile/src/demo.js
diff --git a/packages/person-profile/src/demo.js b/packages/person-profile/src/demo.js
deleted file mode 100644
index c89a0e17..00000000
--- a/packages/person-profile/src/demo.js
+++ /dev/null
@@ -1 +0,0 @@
-import './vpu-person-profile-demo.js';
diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js
index 54a94945..ec7faa89 100644
--- a/packages/person-profile/src/person-profile.js
+++ b/packages/person-profile/src/person-profile.js
@@ -116,5 +116,3 @@ export class PersonProfile extends VPULitElement {
`;
}
}
-
-commonUtils.defineCustomElement('vpu-person-profile', PersonProfile);
diff --git a/packages/person-profile/src/vpu-person-profile-demo.js b/packages/person-profile/src/vpu-person-profile-demo.js
index 213336d3..44c8a8af 100644
--- a/packages/person-profile/src/vpu-person-profile-demo.js
+++ b/packages/person-profile/src/vpu-person-profile-demo.js
@@ -7,7 +7,7 @@ import {PersonProfile} from './index.js';
import * as commonUtils from 'vpu-common/utils';
import * as commonStyles from 'vpu-common/styles';
import $ from 'jquery';
-import 'vpu-person-select';
+import {PersonSelect} from 'vpu-person-select';
class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) {
constructor() {
@@ -22,7 +22,7 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) {
return {
'vpu-person-profile': PersonProfile,
'vpu-auth': Auth,
- 'vpu-person-select': customElements.get('vpu-person-select'),
+ 'vpu-person-select': PersonSelect,
};
}
@@ -45,7 +45,7 @@ class PersonProfileDemo extends ScopedElementsMixin(VPULitElement) {
that.person = window.VPUPersonId;
});
- const personSelect = that._('vpu-person-select');
+ const personSelect = that._(this.constructor.getScopedTagName('vpu-person-select'));
personSelect.onchange = function () {
that.selectedPerson = $(this).data("object").identifier;
};
diff --git a/packages/person-profile/test/unit.js b/packages/person-profile/test/unit.js
index d7877d63..4db121fd 100644
--- a/packages/person-profile/test/unit.js
+++ b/packages/person-profile/test/unit.js
@@ -1,4 +1,4 @@
-import '../src/demo.js';
+import '../src/vpu-person-profile-demo.js';
describe('vpu-person-profile demo', () => {
let node;
diff --git a/packages/person-profile/vendor/auth b/packages/person-profile/vendor/auth
index fbf83528..b9fbe487 160000
--- a/packages/person-profile/vendor/auth
+++ b/packages/person-profile/vendor/auth
@@ -1 +1 @@
-Subproject commit fbf83528159f7d3eeceedff287831dece6b9b46d
+Subproject commit b9fbe487a8a6117ae90a423a8ba318a0321bf51b
diff --git a/packages/person-profile/vendor/common b/packages/person-profile/vendor/common
index 821137e2..9c6dc1fd 160000
--- a/packages/person-profile/vendor/common
+++ b/packages/person-profile/vendor/common
@@ -1 +1 @@
-Subproject commit 821137e246fdcee9ccb04e4cfe420e7abec3186e
+Subproject commit 9c6dc1fd5e004eba32e31adf8e4485a26c345fe0
diff --git a/packages/person-profile/vendor/person-select b/packages/person-profile/vendor/person-select
index 1f49e4b3..50dbadd9 160000
--- a/packages/person-profile/vendor/person-select
+++ b/packages/person-profile/vendor/person-select
@@ -1 +1 @@
-Subproject commit 1f49e4b34a978139cda18f03aecb9a1f18757591
+Subproject commit 50dbadd96a525a68adce81a0263f3d6ac92483de
--
GitLab