From 748b6fdf9af24a605525fbf7b5d5a759460108bb Mon Sep 17 00:00:00 2001
From: ulrich
Date: Fri, 09 Apr 2021 13:46:23 +0000
Subject: [PATCH] JavaScript aufgeraeumt
---
www/ui/js/app.js | 564 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 435 insertions(+), 129 deletions(-)
diff --git a/www/ui/js/app.js b/www/ui/js/app.js
index d242320..7a903d3 100644
--- a/www/ui/js/app.js
+++ b/www/ui/js/app.js
@@ -1,28 +1,270 @@
-function Ablageort(n, o, u) {
- this.name = n;
- this.ort = o;
- this.url = u;
-}
-
-
-
function Mediazentrale() {
var self = this;
var appMenu;
- // var vorlagen;
var cache; // mustache templates
+ var ortPfad;
+ var mediaPfad;
+ var katUrl;
+ var selTitel;
+
+ this.init = function () {
+ self.mediaPfad = '/';
+ self.ortPfad = '/';
+ self.cache = new Array();
+ self.appMenu = new AppMenu();
+ self.appMenu.init(
+ "data/menu/",
+ "hauptmenue.json",
+ "data/tpl/app-menu.tpl",
+ ".west",
+ "8em");
+
+ document.querySelector('.hamburger').addEventListener('click', function (e) {
+ self.menue_umschalten();
+ });
+
+ self.addEvtListener('#mi-katalog', 'click', self.media_liste);
+ self.addEvtListener('#mi-orte', 'click', self.ablageort_liste);
+ self.addEvtListener('#mi-prefs', 'click', self.prefs_liste);
+ self.addEvtListener('#mi-player', 'click', self.abspieler_liste);
+ self.addEvtListener('#mi-listen', 'click', self.abspielliste_liste);
+ self.addEvtListener('#mi-list', 'click', self.titel_liste);
+
+ self.fusszeile_umschalten();
+ self.seitenleiste_umschalten();
+ self.dialog_unten_zeigen();
+ };
+
+ /* ---------------- Entitaets-Listen ----------------- */
+
+ // auf der obersten Ebene werden die Kataloge angezeigt,
+ // darunter der Inhalt des aktuellen Pfades
+ this.media_liste = function() {
+ self.reset_top_buttons();
+ if(self.ortPfad === '/') {
+ // Kataloge listen
+ self.http_get('../api/store/Ablageort/liste/', function (responseText) {
+ //document.querySelector('#top-up-btn').removeEventListener('click', self.media_liste_herauf);
+ self.vorlage_laden_und_fuellen("data/tpl/katalog_root_liste.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText) {
+ var ablageort = JSON.parse(responseText);
+ self.ortPfad = ablageort.url;
+ self.media_liste();
+ });
+ });
+ });
+ });
+ } else {
+ var url = '..' + self.ortPfad + self.mediaPfad;
+ if(!url.endsWith('/')) {
+ url = url + '/';
+ }
+ self.http_get(url, function(responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ var tx = t.textContent;
+ if(t.classList.contains("entity-typ-folder")) {
+ if(self.mediaPfad.endsWith('/')) {
+ self.mediaPfad = self.mediaPfad + tx;
+ } else {
+ self.mediaPfad = self.mediaPfad + '/' + tx;
+ }
+ self.media_liste();
+ } else {
+ if(t.classList.contains('selected')) {
+ self.addSelectedTitel();
+ } else {
+ self.removeClassMulti('selected');
+ t.classList.add('selected');
+ }
+ //self.selTitel = new Titel(t.textContent, self.ortPfad);
+ }
+ });
+ self.addEvtListener('#top-up-btn', 'click', function(event) {
+ if(self.mediaPfad === '/') {
+ self.ortPfad = '/';
+ } else {
+ var pos = self.mediaPfad.lastIndexOf('/');
+ var parent;
+ if(pos > 1) {
+ parent = self.mediaPfad.substring(0, pos);
+ } else {
+ parent = '/';
+ }
+ self.mediaPfad = parent;
+ }
+ self.media_liste();
+ });
+ });
+ });
+ }
+ };
+
+ this.addSelectedTitel = function() {
+ var elem = document.querySelector(".selected");
+ var titelName = elem.textContent;
+ var album = elem.attributes.album.nodeValue;
+ var interpret = elem.attributes.interpret.nodeValue;
+ var anzName = elem.attributes.titelAnzName.nodeValue;
+ var titel;
+ if(self.mediaPfad.endsWith('/')) {
+ titel = new Titel(titelName, self.mediaPfad, self.ortPfad, interpret, anzName, album);
+ } else {
+ titel = new Titel(titelName, self.mediaPfad + '/', self.ortPfad, interpret, anzName, album);
+ }
+ var plname = document.querySelector('#playlist').value;
+ self.http_put('../api/alist/' + plname, JSON.stringify(titel), function(responseText) {
+ self.meldung_mit_timeout(responseText, 1500);
+ });
+ };
this.ablageort_liste = function() {
- self.http_get('../api/store/Ablageort/', function (responseText) {
+ self.reset_top_buttons();
+ self.http_get('../api/store/Ablageort/liste/', function (responseText) {
self.vorlage_laden_und_fuellen("data/tpl/ablageort_liste.tpl", JSON.parse(responseText), function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
self.addEvtListener('.entity-eintrag', 'click', function (event) {
var t = event.target;
- //self.meldung_mit_timeout(t.textContent, 1500);
self.http_get('../api/store/Ablageort/' + t.textContent, function(responseText){
- ablageort = JSON.parse(responseText);
+ var ablageort = JSON.parse(responseText);
self.ablageort_form(ablageort);
});
+ });
+ //self.addEvtListener('#neu-btn', 'click', function (event) {
+ self.addEvtListener('#top-neu-btn', 'click', function(event) {
+ eval("self.ablageort_form" + "(this)");
+ });
+ });
+ });
+ };
+
+ this.prefs_liste = function() {
+ self.reset_top_buttons();
+ self.http_get('../api/store/Einstellung/liste/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/einstellung_liste.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.http_get('../api/store/Einstellung/' + t.textContent, function(responseText){
+ var einstellung = JSON.parse(responseText);
+ self.prefs_form(einstellung);
+ });
+ });
+ self.addEvtListener('#top-neu-btn', 'click', function(event) {
+ eval("self.prefs_form" + "(this)");
+ });
+ });
+ });
+ };
+
+ this.abspieler_liste = function() {
+ self.http_get('../api/store/Abspieler/liste/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/abspieler_liste.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.http_get('../api/store/Abspieler/' + t.textContent, function(responseText){
+ var abspieler = JSON.parse(responseText);
+ self.abspieler_form(abspieler);
+ });
+ });
+ //self.addEvtListener('#neu-btn', 'click', function(event) {
+ self.addEvtListener('#top-neu-btn', 'click', function(event) {
+ eval("self.abspieler_form" + "(this)");
+ });
+ });
+ });
+ };
+
+ this.abspielliste_liste = function() {
+ self.http_get('../api/store/Abspielliste/liste/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/abspielliste_liste.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.http_get('../api/store/Abspielliste/' + t.textContent, function(responseText){
+ var abspielliste = JSON.parse(responseText);
+ self.abspielliste_form(abspielliste);
+ });
+ });
+ self.addEvtListener('#top-neu-btn', 'click', function(event) {
+ eval("self.abspielliste_form" + "(this)");
+ });
+ });
+ });
+ };
+
+ /* -------------------- Entitaets-Formulare ------------------ */
+
+ this.abspielliste_form = function(al) {
+ self.vorlage_laden_und_fuellen("data/tpl/form_abspielliste.tpl", al, function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ const form = document.querySelector('form');
+ form.addEventListener('submit', function(event) {
+ self.handle_submit(event, al.name, '../api/store/Abspielliste/', '#abspielliste-name', function() {
+ self.abspielliste_liste();
+ });
+ });
+ self.addEvtListener('#cancel-btn', 'click', function () {
+ //document.querySelector(".zentraler-inhalt").innerHTML = '';
+ self.abspielliste_liste();
+ });
+ self.addEvtListener('#loeschen-btn', 'click', function(event) {
+ event.preventDefault();
+ self.handle_del_btn('#abspielliste-name', '../api/store/Abspielliste/', function() {
+ self.abspielliste_auswahl_fuellen();
+ self.abspielliste_liste();
+ });
+ });
+ });
+ };
+
+ this.abspieler_form = function(pl) {
+ self.vorlage_laden_und_fuellen("data/tpl/form_abspieler.tpl", pl, function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ const form = document.querySelector('form');
+ form.addEventListener('submit', function(event) {
+ self.handle_submit(event, pl.key, '../api/store/Abspieler/', '#abspieler-name', function() {
+ self.abspieler_liste();
+ });
+ });
+ self.addEvtListener('#cancel-btn', 'click', function () {
+ //document.querySelector(".zentraler-inhalt").innerHTML = '';
+ self.abspieler_liste();
+ });
+ self.addEvtListener('#loeschen-btn', 'click', function(event) {
+ event.preventDefault();
+ self.handle_del_btn('#abspieler-name', '../api/store/Abspieler/', function() {
+ self.abspieler_auswahl_fuellen();
+ self.abspieler_liste();
+ });
+ });
+ });
+ };
+
+ this.prefs_form = function(k) {
+ self.vorlage_laden_und_fuellen("data/tpl/form_einstellung.tpl", k, function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ const form = document.querySelector('form');
+ form.addEventListener('submit', function(event) {
+ self.handle_submit(event, k.key, '../api/store/Einstellung/', '#einstellung-key', function() {
+ self.prefs_liste();
+ });
+ });
+ self.addEvtListener('#cancel-btn', 'click', function (event) {
+ //document.querySelector(".zentraler-inhalt").innerHTML = '';
+ event.preventDefault();
+ self.prefs_liste();
+ });
+ self.addEvtListener('#loeschen-btn', 'click', function(event) {
+ event.preventDefault();
+ self.handle_del_btn('#einstellung-key', '../api/store/Einstellung/', function() {
+ self.prefs_liste();
});
});
});
@@ -39,49 +281,147 @@
this.ablageort_form = function(ort) {
self.vorlage_laden_und_fuellen("data/tpl/form_ablageort.tpl", ort, function (html) {
document.querySelector(".zentraler-inhalt").innerHTML = html;
- self.addEvtListener('#ok-btn', 'click', function () {
- var a = new Ablageort(
- document.querySelector('#ablageort-name').value,
- document.querySelector('#ablageort-ort').value,
- document.querySelector('#ablageort-url').value
- );
- var daten = JSON.stringify(a);
- if(typeof ort === "undefined") {
- self.http_post('../api/store/Ablageort', daten, function (responseText) {
- // hier die Antwort verarbeiten
- });
- } else {
- self.http_put('../api/store/Ablageort', daten, function (responseText) {
- // hier die Antwort verarbeiten
- });
- }
+ const form = document.querySelector('form');
+ form.addEventListener('submit', function(event) {
+ self.handle_submit(event, ort.name, '../api/store/Ablageort/', '#ablageort-name', function() {
+ self.ablageort_liste();
+ });
});
self.addEvtListener('#cancel-btn', 'click', function () {
- document.querySelector(".zentraler-inhalt").innerHTML = '';
+ //document.querySelector(".zentraler-inhalt").innerHTML = '';
+ self.ablageort_liste();
});
- self.addEvtListener('#loeschen-btn', 'click', function() {
- var aoname = document.querySelector('#ablageort-name').value;
- var dlgdata = {"del-elem": aoname};
- self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.tpl', dlgdata, function() {
- self.addEvtListener('#nein-btn', 'click', self.dialog_schliessen);
- self.addEvtListener('#ja-btn', 'click', function() {
- self.http_delete('../api/store/Ablageort/' + aoname, '', function (responseText) {
- // hier die Antwort verarbeiten
- });
- });
+ self.addEvtListener('#loeschen-btn', 'click', function(event) {
+ event.preventDefault();
+ self.handle_del_btn('#ablageort-name', '../api/store/Ablageort/', function() {
+ self.ablageort_liste();
});
});
});
};
-
- this.addEvtListener = function (selector, eventName, func) {
- var elems = document.querySelectorAll(selector);
- var index;
- for (index = 0; index < elems.length; index++) {
- elems[index].addEventListener(eventName, func);
- }
+
+ /* ------------------------------- UI-Dynamik ----------------------- */
+
+ self.reset_top_buttons = function() {
+ self.vorlage_laden_und_fuellen("data/tpl/top_btns.tpl", '', function (html) {
+ document.querySelector(".top-btns").innerHTML = html;
+ });
+ };
+
+ this.abspieler_auswahl_fuellen = function() {
+ self.http_get('../api/store/Abspieler/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/abs_sel.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".abs-sel").innerHTML = html;
+ });
+ });
};
+ this.abspielliste_auswahl_fuellen = function() {
+ self.http_get('../api/store/Abspielliste/', function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/pl_sel.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".pl-sel").innerHTML = html;
+ });
+ });
+ };
+
+ /* Unterer Einblendbereich */
+
+ this.dialog_unten_zeigen = function() {
+ self.vorlage_laden_und_fuellen("data/tpl/ctrl.tpl", "", function (html) {
+ var dlg = document.querySelector(".dialog-unten");
+ dlg.style.height = '4.5em';
+ dlg.innerHTML = html;
+ self.abspieler_auswahl_fuellen();
+ self.abspielliste_auswahl_fuellen();
+ self.addEvtListener('#dazu-btn', 'click', self.addSelectedTitel);
+ self.media_liste();
+ });
+ };
+
+ /* Titel einer Abspielliste */
+
+ this.titel_liste = function() {
+ self.reset_top_buttons();
+ var plname = document.querySelector('#playlist').value;
+ self.http_get('../api/alist/' + plname, function (responseText) {
+ self.vorlage_laden_und_fuellen("data/tpl/titel_liste.tpl", JSON.parse(responseText), function (html) {
+ document.querySelector(".zentraler-inhalt").innerHTML = html;
+ self.addEvtListener('.entity-eintrag', 'click', function (event) {
+ var t = event.target;
+ self.removeClassMulti('selected');
+ t.classList.add('selected');
+ });
+ });
+ });
+ };
+
+ /* ------------- Helfer fuer Entitaets-Formulare ----------------------- */
+
+ /*
+ * existingKey: wenn die Entitaet existiert und geandert werden soll
+ * leer, wenn neue Entitaet
+ */
+ this.handle_submit = function(event, existingKey, putUrl, keySelector, cb) {
+ event.preventDefault();
+ const data = new FormData(event.target);
+ const value = Object.fromEntries(data.entries());
+ console.log({ value });
+ console.log(JSON.stringify(value));
+ var daten = JSON.stringify(value);
+ var formkey = document.querySelector(keySelector).value;
+ formkey = formkey.replace(' ', '').replace(/[\W]+/g, '');
+ if(typeof existingKey === "undefined" || existingKey.length < 1) {
+ // neu
+ self.http_put(putUrl + formkey, daten, function (responseText) {
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
+ } else {
+ // aendern
+ self.http_put(putUrl + existingKey, daten, function (responseText) {
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
+ }
+ };
+
+ this.handle_del_btn = function(selectorKey, delUrl, cb) {
+ var pkey = document.querySelector(selectorKey).value;
+ var dlgdata = {"del-elem": pkey};
+ self.dialog_laden_und_zeigen('data/tpl/dlg-loeschen.tpl', dlgdata, function() {
+ self.addEvtListener('#nein-btn', 'click', self.dialog_schliessen);
+ self.addEvtListener('#ja-btn', 'click', function(event) {
+ console.log("loeschen geklickt.");
+ self.http_delete(delUrl + pkey, '', function (responseText) {
+ self.dialog_schliessen();
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
+ });
+ });
+ };
+
+ /* ------------------ sonstige Helfer ----------------------- */
+
+ this.addEvtListener = function(selector, eventName, func) {
+ document.querySelectorAll(selector).forEach(elem => { elem.addEventListener(eventName, func); });
+ };
+
+ this.removeClassMulti = function(selector) {
+ document.querySelectorAll('.' + selector).forEach(elem => { elem.classList.remove(selector); });
+ };
+
+ /* --------------------- asynchroner HTTP Client ----------------- */
+
this.http_get = function (u, cb) {
self.http_call('GET', u, null, cb);
};
@@ -95,6 +435,7 @@
};
this.http_delete = function (u, data, cb) {
+ console.log("delete " + u);
self.http_call('DELETE', u, data, cb);
};
@@ -109,40 +450,13 @@
xhr.open(method, url);
if (method === 'GET') {
xhr.send();
- } else if (method === 'POST' || method === 'PUT') {
+ } else if (method === 'POST' || method === 'PUT' || method === 'DELETE') {
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr.send(data);
}
};
-
- this.serialisieren = function (obj) {
- return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}';
- };
-
-
-
-
- /* ab hier aus App-Vorlage */
-
- this.init = function () {
- //self.vorlagen = new Vorlagen();
- self.cache = new Array();
- self.appMenu = new AppMenu();
- self.appMenu.init(
- "data/menu/",
- "hauptmenue.json",
- "data/tpl/app-menu.tpl",
- ".west",
- "8em");
-
- document.querySelector('.hamburger').addEventListener('click', function (e) {
- self.menue_umschalten();
- });
-
- self.fusszeile_umschalten();
- self.seitenleiste_umschalten();
-
- };
+
+ /* ------------------------ aus App-Vorlage ------------------- */
this.menue_umschalten = function () {
var ham = document.querySelector(".hamburger");
@@ -218,8 +532,8 @@
}, 500);
}, timeout);
};
-
- /* Dialog-Funktionen */
+
+ /* --------------------- Dialog-Funktionen ------------------------ */
/*
Einen Dialog aus Vorlagen erzeugen
@@ -233,60 +547,34 @@
self.http_get(vurl, function(antwort) {
self.cache[vurl] = antwort;
self.dialog_zeigen(vurl, msgTpl, cb);
- //self.dialog_zeigen(vurl, antwort, cb);
- //self.vorlage_fuellen(vurl, inhalt, cb);
});
} else {
self.dialog_zeigen(vurl, msgTpl, cb);
- //self.dialog_zeigen(vurl, vorlage, cb);
}
};
this.dialog_zeigen = function (vurl, inhalt, cb) {
var dlg = document.querySelector(".dialog");
- self.html_erzeugen(
- vurl,
- inhalt,
- function (html) {
- //dlg.html(html);
- dlg.style.height = '7em';
- dlg.innerHTML = html;
- document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
- //dlg.slideDown(300);
- if(typeof(cb) !== 'function') {
- // ..
- } else {
- cb();
- }
- });
+ self.html_erzeugen(vurl, inhalt, function (html) {
+ dlg.style.height = '7em';
+ dlg.innerHTML = html;
+ document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
+ });
};
-
-
-/*
- this.dialog_zeigen = function (vurl, inhalt) {
- var dlg = document.querySelector(".dialog");
- self.html_erzeugen(
- vurl,
- inhalt,
- function (html) {
- //dlg.html(html);
- dlg.style.height = '5em';
- dlg.innerHTML = html;
- document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
- //dlg.slideDown(300);
- });
- };
-*/
- self.dialog_schliessen = function () {
+
+ this.dialog_schliessen = function () {
document.querySelector('.close-btn').removeEventListener('click', self.dialog_schliessen);
- //$('.dialog').slideUp(300);
var dlg = document.querySelector('.dialog');
- //dlg.style.display = "none";
dlg.style.height = '0';
dlg.innerHTML = '';
};
- /* Vorlagen */
+ /* --------------------- Vorlagen ---------------------- */
/*
Das HTML erzeugen, das entsteht, wenn eine Vorlage mit Inhalt
@@ -314,8 +602,6 @@
};
this.vorlage_fuellen = function (vurl, inhalt, cb) {
- //console.log("vorlage " + self.cache[vurl]);
- //console.log("render " + inhalt);
cb(Mustache.render(self.cache[vurl], inhalt));
};
@@ -328,16 +614,6 @@
Inhalt gefüllt ist
*/
this.vorlage_laden_und_fuellen = function (vurl, inhalt, cb) {
- /*
- $.ajax({
- url: vurl,
- type: "GET",
- dataType : "text"
- }).done(function( vorlage ) {
- self.cache[vurl] = vorlage;
- self.vorlage_fuellen(vurl, inhalt, cb);
- });
- */
var xmlhttp = new XMLHttpRequest();
xmlhttp.onreadystatechange = function () {
if (this.readyState == 4 && this.status == 200) {
@@ -352,3 +628,33 @@
}
+/* ----------- Objekte ---------------- */
+
+function Ablageort(n, o, u) {
+ this.name = n;
+ this.ort = o;
+ this.url = u;
+}
+
+function Einstellung(k, v) {
+ this.key = k;
+ this.value = v;
+}
+
+function Abspieler(n, u) {
+ this.name = n;
+ this.url = u;
+}
+
+function Abspielliste(n) {
+ this.name = n;
+}
+
+function Titel(n, p, u, i, t, a) {
+ this.katalogUrl = u;
+ this.pfad = p;
+ this.name = n;
+ this.interpret = i;
+ this.titelAnzName = t;
+ this.album = a;
+}
\ No newline at end of file
--
Gitblit v1.9.3