From 4f01b813c127607a7025faff4ac693e049ea4101 Mon Sep 17 00:00:00 2001 From: ulrich Date: Wed, 13 Jan 2021 17:26:37 +0000 Subject: [PATCH] Listenansicht und Umschaltung fertig --- web/ui2/js/app.js | 329 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 280 insertions(+), 49 deletions(-) diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js index 480b26e..b9d1d80 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() { @@ -135,39 +149,96 @@ dlg.style.height = '0'; dlg.innerHTML = ''; }; + + this.fm_dateiwahl = function(ev) { + var elem = ev.target; + if(self.modus == 'kacheln') { + // Kacheln + if(elem.classList.contains("icon-folder")) { + if(/*ev.shiftKey || */ ev.ctrlKey) { + var par = elem.parentElement; + par.querySelector('.dateiname').classList.add('datei-gewaehlt'); + } else { + var ordner = elem.parentElement.querySelector('.dateiname').textContent.trim(); + if(self.pfad.length > 0) { + self.pfad = self.pfad + '/' + ordner; + } else { + self.pfad = ordner; + } + self.fm_get_list(self.pfad); + } + } else if(elem.classList.contains('datei')) { + if(/*ev.shiftKey || */ ev.ctrlKey) { + // mehrere Dateien sollen gewaehlt werden + } else { + var gew = document.querySelector('.datei-gewaehlt'); + if(gew != undefined) { + gew.classList.remove('datei-gewaehlt'); + } + } + var par = elem.parentElement; + par.querySelector('.dateiname').classList.add('datei-gewaehlt'); + } else { + //console.log('kein folder oder file...'); + } + } else { + // Liste + var pElem = elem.closest('.datei-zeile'); + var dElem = pElem.querySelector('.datei-elem'); + if(dElem.getElementsByTagName("i")[0].classList.contains('icon-doc-text-inv')) { + // Datei + if(/*ev.shiftKey || */ ev.ctrlKey) { + // mehrere Dateien sollen gewaehlt werden + } else { + var ti = document.querySelector('.table-info'); + if(ti !== null) { + ti.classList.remove('table-info'); + } + var dg = document.querySelector('.datei-gewaehlt'); + if(dg !== null) { + dg.classList.remove('datei-gewaehlt'); + } + } + pElem.classList.add('table-info'); + pElem.querySelector('.dateiname').classList.add('datei-gewaehlt'); + } else { + // Ordner + if(/*ev.shiftKey || */ ev.ctrlKey) { + //elem.children[0].classList.add('datei-gewaehlt'); + pElem.querySelector('.dateiname').classList.add('datei-gewaehlt'); + } else { + var ordner = pElem.querySelector('.dateiname').textContent; + if(self.pfad.length > 0) { + self.pfad = self.pfad + '/' + ordner; + } else { + self.pfad = ordner; + } + self.fm_get_list(self.pfad); + } + } + } + }; + this.fm_render_list = function (fl) { - if (self.modus == 'kacheln') { + if (self.modus === 'kacheln') { // Kachelansicht - - // neu bauen - - /* - var template = $('#tpl-kacheln').html(); - Mustache.parse(template); // optional, speeds up future uses - $('.datei-zeile').attr('onclick', '').unbind('click'); - $('#dateien').empty(); - $('#dateien').html(Mustache.render(template, fl)); - $('.figure').click(fm_dateiwahl); - */ + self.html_erzeugen("data/tpl/kacheln.tpl", fl, function(html) { + var elem = document.querySelector('#dateien'); + elem.innerHTML = html; + self.addEvtListener('.figure', 'click', self.fm_dateiwahl); + }); } else { // Listenansicht - - // neu bauen - - /* - var template = $('#tpl-liste').html(); - Mustache.parse(template); // optional, speeds up future uses - $('.figure').attr('onclick', '').unbind('click'); - $('#dateien').empty(); - $('#dateien').html(Mustache.render(template, fl)); - $('.datei-zeile').click(fm_dateiwahl); - */ + self.html_erzeugen("data/tpl/liste.tpl", fl, function(html) { + var elem = document.querySelector('#dateien'); + elem.innerHTML = html; + self.addEvtListener('.datei-zeile', 'click', self.fm_dateiwahl); + }); } }; this.fm_get_path = function (uid) { - //console.log('pfad: ' + pfad); var restdir; if (self.pfad.indexOf(self.PUB_DIR) > -1) { restdir = self.pfad.substr(self.PUB_DIR.length); @@ -186,8 +257,7 @@ restdir = restdir.replace(self.WWW_DIR, 'data'); } } - var pdir = fm_get_base(uid); - // console.log('fm_get_path path: ' + pdir + "/" + restdir); + var pdir = self.fm_get_base(uid); if (restdir.length > 1) { return pdir + "/" + restdir; } else { @@ -196,7 +266,6 @@ }; this.fm_get_base = function (uid) { - //console.log('pfad: ' + pfad); var pdir; if (self.pfad.indexOf(self.PUB_DIR) > -1) { pdir = '/data/' + uid; @@ -207,16 +276,138 @@ } else if (self.pfad.indexOf(self.DATA_DIR) > -1) { pdir = ''; } - //console.log('fm_get_base base: ' + pdir + uid); return pdir; }; + + /** + * Aus einem relativen Pfad ein Array aus BcrFile Objekten + * machen + * + * @param {String} relPfad der relative Pfad + * @returns {Array} die BcrFile-Objekte zum Pfad als Array + */ + this.fm_buildBreadcrumb = function(relPfad) { + var rp = ''; + var dirList = new Array(); + dirList.push(new BcrFile(rp, 'Home')); + if(relPfad.length > 1) { + var dirs = relPfad.split('/'); + for(var i = 0; i < dirs.length; i++) { + if(rp.length > 0 ) { + // weitere Einträge + dirList.push(new BcrFile(rp + '/' + dirs[i], dirs[i])); + rp = rp + '/' + dirs[i]; + } else { + // erster Eintrag + dirList.push(new BcrFile(dirs[i], dirs[i])); + rp = dirs[i]; + } + } + } + return dirList; + }; + + /* + * icon-th-large + * icon-th-list + * @returns {undefined} + */ + this.fm_ansicht_umschalten = function() { + var elem = document.querySelector('#ansicht'); + var iElem = elem.getElementsByTagName("i")[0]; + if(iElem.classList.contains('icon-th-list')) { + iElem.classList.add('icon-th-large'); + iElem.classList.remove('icon-th-list'); + self.modus = 'liste'; + } else { + iElem.classList.add('icon-th-list'); + iElem.classList.remove('icon-th-large'); + self.modus = 'kacheln'; + } + self.fm_get_list(self.pfad); + }; + this.fm_set_modus = function() { + var elem = document.querySelector('#ansicht'); + var iElem = elem.getElementsByTagName("i")[0]; + if(self.modus === 'kacheln') { + iElem.classList.add('icon-th-list'); + iElem.classList.remove('icon-th-large'); + } else { + iElem.classList.add('icon-th-large'); + iElem.classList.remove('icon-th-list'); + } + }; + + + /** + * Der letzte Eintrag in dirs ist der aktuelle Ordner und + * deshalb ausgegraut. + * + * Wenn nur ein Ordner in dirs enthalten ist, dann sind wir + * an der obersten Ebene (Home). + * + * @param {Array} dirList ein Array aus BcrFile-Objekten + * @returns nichts + */ + this.fm_renderBreadcrumb = function(dirList) { + var elem = document.querySelector('.breadcrumb'); + if(dirList.length > 1) { + var last = dirList.pop(); + var bcList = new BcrFiles(dirList); + + self.html_erzeugen("data/tpl/bcr.tpl", bcList, function(html) { + var htmlGesamt = html; + self.html_erzeugen("data/tpl/bcr2.tpl", last, function(html) { + htmlGesamt += html; + self.html_erzeugen("data/tpl/bcr3.tpl", dirList[0], function(html) { + htmlGesamt += html; + elem.innerHTML = htmlGesamt; + self.addEvtListener('.bc-link', 'click', self.fm_bc_click); + self.addEvtListener('#ansicht', 'click', self.fm_ansicht_umschalten); + self.fm_set_modus(); + }); + + }); + }); + } else { + // oberste Ebene + var htmla; + var htmlb; + self.html_erzeugen("data/tpl/bcr2.tpl", dirList[0], function(html) { + htmla = html; + self.html_erzeugen("data/tpl/bcr3.tpl", dirList[0], function(html) { + htmlb = html; + elem.innerHTML = htmla + htmlb; + self.addEvtListener('.bc-link', 'click', self.fm_bc_click); + self.addEvtListener('#ansicht', 'click', self.fm_ansicht_umschalten); + self.fm_set_modus(); + }); + }); + } + }; + + /** + * Auf den Klick auf ein Breadcrumb-Element reagieren: + * Den Ordner-Inhalt des geklickten Elements anzeigen + * @returns nichts + */ + this.fm_bc_click = function() { + var elem = this; + var bcPfad = elem.getAttribute("rpath"); + if(bcPfad !== undefined) { + self.pfad = bcPfad; + self.fm_get_list(bcPfad); + } else { + pfad = ''; + self.fm_get_list(''); + } + }; /* API functions */ // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p= this.fm_get_list = function (relPfad) { - //$('#ansicht').attr('onclick', '').unbind('click'); var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad; var u = '../svc' + m; self.fm_get(u, "json", function (respText) { @@ -234,12 +425,14 @@ self.fm_render_list(fl); } else { // #dateien leeren - var elems = document.querySelector("#dateien"); - var count = elems[0].childElementCount; - for(var i = count-1; i > -1; i--) { - elems[0].removeChild(i); - } + var elem = document.querySelector("#dateien"); + elem.innerHTML = ''; } + + // Breadcrumb + + var dirList = self.fm_buildBreadcrumb(relPfad); + self.fm_renderBreadcrumb(dirList); }); }; @@ -263,6 +456,44 @@ window.location.href = '../logout.html'; }); }; + + /* ----- Hilfsfunktionen ----- */ + + this.serialisieren = function(obj) { + return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}'; + }; + + this.addEvtListener = function(selector, eventName, func) { + document.querySelectorAll(selector).forEach(elem => { elem.addEventListener(eventName, func); }); + }; + + this.removeAllListeners = function(id) { + var el = document.getElementById(id); + elClone = el.cloneNode(true); + el.parentNode.replaceChild(elClone, el); + }; // https://stackoverflow.com/questions/19469881/remove-all-event-listeners-of-specific-type + + /* ---- 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