From 2442f9e5aabc718681795e9fba3e4aadaca460cd Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 07 Apr 2021 22:12:16 +0000 Subject: [PATCH] Versuche entfernt --- www/ui/js/app.js | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/www/ui/js/app.js b/www/ui/js/app.js index 12a6b1e..ded0e0e 100644 --- a/www/ui/js/app.js +++ b/www/ui/js/app.js @@ -74,18 +74,35 @@ }); } else { // Pfad listen - self.http_get('..' + self.ortPfad + '/' + self.mediaPfad + '/', function(responseText) { + // console.log("vorher ortPfad: " + self.ortPfad); + //console.log("vorher mediaPfad: " + self.mediaPfad); + //self.http_get('..' + self.ortPfad + '/' + self.mediaPfad + '/', function(responseText) { + var url = '..' + self.ortPfad + self.mediaPfad; + if(!url.endsWith('/')) { + url = url + '/'; + } + //console.log("url: " + url); + self.http_get(url, function(responseText) { //console.log(responseText); self.vorlage_laden_und_fuellen("data/tpl/katalog_inhalt_liste.tpl", JSON.parse(responseText), function (html) { document.querySelector(".zentraler-inhalt").innerHTML = html; + //console.log("mediaPfad bei Anzeige: " + self.mediaPfad); self.addEvtListener('.entity-eintrag', 'click', function (event) { var t = event.target; - //console.log(t.textContent); + var tx = t.textContent; + //console.log("tx: " + tx); + //console.log("mediaPfad nach Auswahl: " + self.mediaPfad); if(t.classList.contains("entity-typ-folder")) { - self.mediaPfad = self.mediaPfad + '/' + t.textContent; + if(self.mediaPfad.endsWith('/')) { + self.mediaPfad = self.mediaPfad + tx; + } else { + self.mediaPfad = self.mediaPfad + '/' + tx; + } + //self.mediaPfad = self.mediaPfad + t.textContent; + //console.log("mediaPfad neu: " + self.mediaPfad); self.media_liste(); } else { - console.log("Media-Inhalt auswaehlen oder abspielen"); + //console.log("Media-Inhalt auswaehlen oder abspielen"); self.removeClassMulti('selected'); t.classList.add('selected'); } @@ -95,7 +112,12 @@ self.ortPfad = '/'; } else { var pos = self.mediaPfad.lastIndexOf('/'); - var parent = self.mediaPfad.substring(0, pos); + var parent; + if(pos > 1) { + parent = self.mediaPfad.substring(0, pos); + } else { + parent = '/'; + } //console.log("Parent: " + parent); self.mediaPfad = parent; } @@ -105,8 +127,6 @@ }); } }; - - /* Die folgenden '_liste' Funktionen koennen noch vereinheitlicht werden */ this.ablageort_liste = function() { self.http_get('../api/store/Ablageort/liste/', function (responseText) { @@ -161,8 +181,6 @@ }); }); }; - - /* Die folgenden '_form' Funktionen koennen noch vereinheitlicht werden */ this.abspieler_form = function(pl) { self.vorlage_laden_und_fuellen("data/tpl/form_abspieler.tpl", pl, function (html) { @@ -321,18 +339,6 @@ this.removeClassMulti = function(selector) { document.querySelectorAll('.' + selector).forEach(elem => { elem.classList.remove(selector); }); }; - - /* - 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); - } - }; - */ - - // document.querySelectorAll(selector).forEach(elem => { elem.addEventListener(eventName, func); }); /* --------------------- asynchroner HTTP Client ----------------- */ @@ -558,5 +564,4 @@ function Abspieler(n, u) { this.name = n; this.url = u; -} - +} \ No newline at end of file -- Gitblit v1.9.3