From ec38f9c1516efb9a4d53461351910256565b9e11 Mon Sep 17 00:00:00 2001 From: Fabio Pliger Date: Thu, 28 Apr 2022 14:00:31 -0600 Subject: [PATCH] more cleaning --- pyscriptjs/src/App.svelte | 6 ------ pyscriptjs/src/components/base.ts | 12 ++++++------ pyscriptjs/src/components/pybox.ts | 5 +---- pyscriptjs/src/components/pybutton.ts | 2 +- pyscriptjs/src/components/pyenv.ts | 14 -------------- 5 files changed, 8 insertions(+), 31 deletions(-) diff --git a/pyscriptjs/src/App.svelte b/pyscriptjs/src/App.svelte index f69e4c1..47d7592 100644 --- a/pyscriptjs/src/App.svelte +++ b/pyscriptjs/src/App.svelte @@ -11,7 +11,6 @@ scriptsQueue, } from './stores'; - let iconSize = 2; let pyodideReadyPromise; const initializePyodide = async () => { @@ -26,11 +25,6 @@ value[newEnv['id']] = newEnv; }); - let showNavBar = false; - navBarOpen.subscribe(value => { - showNavBar = value; - }); - // now we call all initializers before we actually executed all page scripts for (let initializer of $initializers) { await initializer(); diff --git a/pyscriptjs/src/components/base.ts b/pyscriptjs/src/components/base.ts index ae1f420..9d2d4e2 100644 --- a/pyscriptjs/src/components/base.ts +++ b/pyscriptjs/src/components/base.ts @@ -1,4 +1,4 @@ -import { componentDetailsNavOpen, loadedEnvironments, mode, pyodideLoaded } from '../stores'; +import { loadedEnvironments, mode, pyodideLoaded } from '../stores'; import { guidGenerator, addClasses } from '../utils'; // Premise used to connect to the first available pyodide interpreter let pyodideReadyPromise; @@ -13,10 +13,6 @@ loadedEnvironments.subscribe(value => { environments = value; }); -let propertiesNavOpen; -componentDetailsNavOpen.subscribe(value => { - propertiesNavOpen = value; -}); mode.subscribe(value => { currentMode = value; @@ -52,7 +48,11 @@ export class BaseEvalElement extends HTMLElement { this.outputElement.hidden = false; } - postEvaluate() {} + // subclasses should overwrite this method to define custom logic + // after code has been evaluated + postEvaluate() { + return null; + } checkId() { if (!this.id) this.id = this.constructor.name + '-' + guidGenerator(); diff --git a/pyscriptjs/src/components/pybox.ts b/pyscriptjs/src/components/pybox.ts index 0aa4bf5..8d73994 100644 --- a/pyscriptjs/src/components/pybox.ts +++ b/pyscriptjs/src/components/pybox.ts @@ -49,14 +49,11 @@ export class PyBox extends HTMLElement { this.widths.push(`w-${w}`); } } else { - for (const el of mainDiv.childNodes) { - this.widths.push(`w-1/${mainDiv.childNodes.length}`); - } + this.widths = [...this.widths, ...[`w-1/${mainDiv.childNodes.length}`]]; } this.widths.forEach((width, index)=>{ const node: ChildNode = mainDiv.childNodes[index]; - // @ts-ignore addClasses(node, [width, 'mx-4']) }) diff --git a/pyscriptjs/src/components/pybutton.ts b/pyscriptjs/src/components/pybutton.ts index ad54f9b..6650de9 100644 --- a/pyscriptjs/src/components/pybutton.ts +++ b/pyscriptjs/src/components/pybutton.ts @@ -1,5 +1,5 @@ import { BaseEvalElement } from './base'; -import { addClasses, ltrim, htmlDecode } from '../utils'; +import { addClasses, htmlDecode } from '../utils'; export class PyButton extends BaseEvalElement { shadow: ShadowRoot; diff --git a/pyscriptjs/src/components/pyenv.ts b/pyscriptjs/src/components/pyenv.ts index ec924f8..317e481 100644 --- a/pyscriptjs/src/components/pyenv.ts +++ b/pyscriptjs/src/components/pyenv.ts @@ -5,20 +5,6 @@ import { loadPackage, loadFromFile } from '../interpreter'; // Premise used to connect to the first available pyodide interpreter let pyodideReadyPromise; -let environments; -let currentMode; - -pyodideLoaded.subscribe(value => { - pyodideReadyPromise = value; -}); - -loadedEnvironments.subscribe(value => { - environments = value; -}); - -mode.subscribe(value => { - currentMode = value; -}); export class PyEnv extends HTMLElement { shadow: ShadowRoot;