From dfedaa83f35fc2b78d1600126a1d3f1415cc5b0f Mon Sep 17 00:00:00 2001 From: Dakedres Date: Fri, 7 Feb 2025 23:59:18 -0700 Subject: [PATCH] Cleanup --- src/main.js | 6 ++++++ src/player.js | 0 src/view/browser.js | 2 +- src/view/player.js | 3 +++ src/view/view.js | 7 ------- yarn.lock | 5 +++++ 6 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 src/player.js diff --git a/src/main.js b/src/main.js index 0c63e44..c1f869b 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,9 @@ window.hiss = { import * as index from './index/index.js' import * as view from './view/view.js' +import * as player from './view/player.js' +import * as browser from './view/browser.js' +import * as queue from './view/queue.js' import Store from 'store' import * as device from 'device' @@ -47,6 +50,9 @@ export async function State() { { Object.assign(window, { view, + player, + browser, + queue, device, index, diff --git a/src/player.js b/src/player.js new file mode 100644 index 0000000..e69de29 diff --git a/src/view/browser.js b/src/view/browser.js index 371a418..ff53602 100644 --- a/src/view/browser.js +++ b/src/view/browser.js @@ -45,7 +45,7 @@ export async function Init() { a['Enter'] = a[' '] = { down(focus) { - queue.Add(Entry(hiss.view.browser.focus)) + view.player.Queue(Entry(hiss.view.browser.focus)) view.FocusNext() } } diff --git a/src/view/player.js b/src/view/player.js index 498b198..a2363fe 100644 --- a/src/view/player.js +++ b/src/view/player.js @@ -1,4 +1,7 @@ import * as index from "../index/index.js" +import * as player from './player.js' +import * as browser from './browser.js' +import * as queue from './queue.js' export function State() { hiss.state.queue = [] diff --git a/src/view/view.js b/src/view/view.js index 06ab9da..d497820 100644 --- a/src/view/view.js +++ b/src/view/view.js @@ -3,16 +3,9 @@ import * as player from './player.js' import * as browser from './browser.js' import * as queue from './queue.js' -export { - player, - browser, - queue -} - export function State() { player.State() browser.State() - queue.State() } export async function Init() { diff --git a/yarn.lock b/yarn.lock index a529c0a..2b4fdc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -876,6 +876,11 @@ resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.2.tgz" integrity sha512-PaW2DY5Tan+IFvNJGHDmUrORadbe/Ceh8tQxi8cmdQVCCYsLoQo2cuaSj+AU+YRX8M4ivS2vJ9UGaxfuNN7gmg== +"@rollup/rollup-linux-x64-musl@4.27.2": + version "4.27.2" + resolved "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.2.tgz" + integrity sha512-dOlWEMg2gI91Qx5I/HYqOD6iqlJspxLcS4Zlg3vjk1srE67z5T2Uz91yg/qA8sY0XcwQrFzWWiZhMNERylLrpQ== + "@types/estree@^1.0.0", "@types/estree@1.0.6": version "1.0.6" resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz"