Skip to content

Commit b66976e

Browse files
committed
feat: remove old dependency on pie-control-panel
1 parent 7b8b2e6 commit b66976e

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "pie",
3-
"version": "10.3.4",
3+
"version": "10.4.0",
44
"description": "The Portable Interaction Elements framework CLI",
55
"preferGlobal": true,
66
"bin": {
@@ -100,7 +100,6 @@
100100
"minimist": "^1.2.0",
101101
"ora": "^1.2.0",
102102
"pie-catalog-client": "^2.2.0",
103-
"pie-control-panel": "^1.3.0",
104103
"pie-controller": "^3.3.0",
105104
"pie-player": "^3.4.0",
106105
"pie-support-less": "PieLabs/pie-support-less#master",

src/apps/default/src-generators/all-in-one.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,24 @@ export function allInOne(
1010
pieModels: Model[],
1111
weights: any,
1212
langs: any,
13-
scoringType: string = 'weighted'): string {
14-
13+
scoringType: string = 'weighted'
14+
): string {
1515
return `
1616
import Controller from 'pie-controller';
1717
1818
${declarations.map(d => d.js).join('\n')}
1919
2020
import PiePlayer from 'pie-player';
2121
customElements.define('pie-player', PiePlayer);
22-
import ControlPanel from 'pie-control-panel';
22+
import ControlPanel from 'pie-catalog-client/src/catalog-demo/control-panel';
2323
customElements.define('pie-control-panel', ControlPanel);
24+
require('pie-catalog-client/src/bootstrap/common.less');
25+
require('material-elements/src/select-field');
2426
2527
const controllerMap = {};
26-
${controllerMap.map(t => `controllerMap['${t.pie}'] = require('${t.target}');`).join('\n')}
28+
${controllerMap
29+
.map(t => `controllerMap['${t.pie}'] = require('${t.target}');`)
30+
.join('\n')}
2731
2832
export default class Bundled extends HTMLElement{
2933
@@ -67,8 +71,8 @@ export function allInOne(
6771
console.error(e);
6872
});
6973
70-
panel.addEventListener('envChanged', function (event) {
71-
const {env} = event.target;
74+
panel.addEventListener('env-changed', function (event) {
75+
const {env} = event.detail;
7276
player.env(env)
7377
.then(() => {
7478
if (env.mode === 'evaluate') {
@@ -95,7 +99,7 @@ export function allInOne(
9599
.control-panel-holder {
96100
display: flex;
97101
align-items: center;
98-
background-color: rgba(0,0,0,0.1);
102+
background-color: var(--catalog-header-bg, rgba(0, 50, 49, 0.9));
99103
padding: 0;
100104
margin: 0;
101105
padding-left: 10px;

0 commit comments

Comments
 (0)