From 41ab37e425058eab58e640c94b79b3a9e26fb169 Mon Sep 17 00:00:00 2001 From: ulrich Date: Sat, 09 Jan 2021 19:15:13 +0000 Subject: [PATCH] Erste Anpassungen am Rendering bei ui2 --- web/ui2/js/app.js | 81 ++++++++++++++++++++++++++++++++-------- 1 files changed, 65 insertions(+), 16 deletions(-) diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js index 480b26e..d194768 100644 --- a/web/ui2/js/app.js +++ b/web/ui2/js/app.js @@ -1,18 +1,19 @@ function AppVorlage() { var self = this; - var appMenu; - var vorlagen; - var api; - var userid; - var pfad = ''; - var loc; - var modus = 'kacheln'; - var PERS_DIR = "Persoenlich"; - var PUB_DIR = "Oeffentlich"; - var DAV_DIR = "Austausch"; - var BASE_DIR = "$basis"; - var DATA_DIR = "$daten"; - var WWW_DIR = "www"; + this.appMenu; + this.vorlagen; + this.api; + this.userid; + this.pfad = ''; + this.loc; + this.modus = 'kacheln'; + this.PERS_DIR = "Persoenlich"; + this.PUB_DIR = "Oeffentlich"; + this.DAV_DIR = "Austausch"; + this.BASE_DIR = "$basis"; + this.DATA_DIR = "$daten"; + this.WWW_DIR = "www"; + this.cache = {}; // mustache template cache this.datei_neuer_text = function () { self.meldung_mit_timeout("Neuer Text", 1500); @@ -21,7 +22,7 @@ /* Funktionen aus App-Vorlage */ this.init = function () { - self.vorlagen = new Vorlagen(); + //self.vorlagen = new Vorlagen(); self.appMenu = new AppMenu(); self.appMenu.init( "data/menu/", @@ -33,8 +34,21 @@ self.menue_umschalten(); }); self.fm_get_login(); - self.fm_get_list(''); + + var parsedUrl = new URL(window.location.href); + var wunschPfad = parsedUrl.searchParams.get("pfad"); + + if(wunschPfad !== null && wunschPfad.length > 0) { + self.pfad = wunschPfad; + self.fm_get_list(wunschPfad); + } else { + self.fm_get_list(''); + } + //fm_init_uploader(); self.loc = window.location.protocol + '//' + window.location.host; + + //self.fm_get_list(''); + //self.loc = window.location.protocol + '//' + window.location.host; }; this.login_zeigen = function() { @@ -136,11 +150,21 @@ dlg.innerHTML = ''; }; + this.html_zeigen = function(html) { + // was mit dem html getan werden soll.. + var elem = document.querySelector('#dateien'); + elem.innerHTML = html; + }; + this.fm_render_list = function (fl) { if (self.modus == 'kacheln') { // Kachelansicht // neu bauen + + //html_erzeugen = function(vurl, inhalt, cb) + + self.html_erzeugen("data/tpl/kacheln.tpl", fl, self.html_zeigen); /* var template = $('#tpl-kacheln').html(); @@ -186,7 +210,7 @@ restdir = restdir.replace(self.WWW_DIR, 'data'); } } - var pdir = fm_get_base(uid); + var pdir = self.fm_get_base(uid); // console.log('fm_get_path path: ' + pdir + "/" + restdir); if (restdir.length > 1) { return pdir + "/" + restdir; @@ -232,6 +256,7 @@ } var fl = new FileList(files); self.fm_render_list(fl); + //self.fm_render_list(resp); } else { // #dateien leeren var elems = document.querySelector("#dateien"); @@ -263,6 +288,30 @@ window.location.href = '../logout.html'; }); }; + + /* ---- Vorlagen ---- */ + + this.html_erzeugen = function(vurl, inhalt, cb) { + var vorlage = self.cache[vurl]; + if(vorlage === undefined) { + self.vorlage_laden_und_fuellen(vurl, inhalt, cb); + } else { + self.vorlage_fuellen(vurl, inhalt, cb); + } + }; + + this.vorlage_fuellen = function(vurl, inhalt, cb) { + cb(Mustache.render(self.cache[vurl], inhalt)); + }; + + this.vorlage_laden_und_fuellen = function(vurl, inhalt, cb) { + self.fm_get(vurl, "text", function(antwort) { + self.cache[vurl] = antwort; + self.vorlage_fuellen(vurl, inhalt, cb); + }); + }; + + /* -------- ajax helper functions ----------- */ -- Gitblit v1.9.3