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 | 320 +++++++++++++++++++++++++----------------------------
1 files changed, 152 insertions(+), 168 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index fa1d44d..b9d1d80 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -149,31 +149,17 @@
dlg.style.height = '0';
dlg.innerHTML = '';
};
-
- /*
- this.html_zeigen = function(html) {
- // was mit dem html getan werden soll..
- var elem = document.querySelector('#dateien');
- elem.innerHTML = html;
- $('.figure').click(fm_dateiwahl);
- };
- */
this.fm_dateiwahl = function(ev) {
var elem = ev.target;
- //console.log(elem.nodeName);
- //var elem = this;
- //console.log('dateiwahl nach click, event shift: ' + ev.shiftKey + ", event ctrl: " + ev.ctrlKey);
if(self.modus == 'kacheln') {
// Kacheln
if(elem.classList.contains("icon-folder")) {
- //console.log('contains icon-folder');
if(/*ev.shiftKey || */ ev.ctrlKey) {
- //$(elem).find('.dateiname').addClass('datei-gewaehlt');
- elem.querySelector('.dateiname').classList.add('datei-gewaehlt');
+ var par = elem.parentElement;
+ par.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
var ordner = elem.parentElement.querySelector('.dateiname').textContent.trim();
- //console.log('ordner ' + ordner);
if(self.pfad.length > 0) {
self.pfad = self.pfad + '/' + ordner;
} else {
@@ -182,7 +168,6 @@
self.fm_get_list(self.pfad);
}
} else if(elem.classList.contains('datei')) {
- //console.log('contains datei');
if(/*ev.shiftKey || */ ev.ctrlKey) {
// mehrere Dateien sollen gewaehlt werden
} else {
@@ -191,37 +176,44 @@
gew.classList.remove('datei-gewaehlt');
}
}
- //$(elem).find('.dateiname').addClass('datei-gewaehlt');
var par = elem.parentElement;
- //console.log(par.nodeName);
par.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
//console.log('kein folder oder file...');
}
} else {
- // Liste NOCH NEU MACHEN OHNE jQuery, wenn Liste implementiert ist
- if(elem.querySelector('.datei-elem').children(0).hasClass('icon-doc-text-inv')) {
+ // 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 {
- document.querySelector('.table-info').classList.remove('table-info');
- document.querySelector('.datei-gewaehlt').classList.remove('datei-gewaehlt');
+ 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');
+ }
}
- elem.classList.add('table-info');
- elem.querySelector('.dateiname').classList.add('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');
+ //elem.children[0].classList.add('datei-gewaehlt');
+ pElem.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
- var ordner = elem.querySelector('.dateiname').textContent;
+ var ordner = pElem.querySelector('.dateiname').textContent;
if(self.pfad.length > 0) {
self.pfad = self.pfad + '/' + ordner;
} else {
self.pfad = ordner;
}
- self.fm_get_list(pfad);
+ self.fm_get_list(self.pfad);
}
}
}
@@ -229,48 +221,24 @@
this.fm_render_list = function (fl) {
- if (self.modus == 'kacheln') {
+ if (self.modus === 'kacheln') {
// Kachelansicht
-
- // neu bauen
-
- //html_erzeugen = function(vurl, inhalt, cb)
-
self.html_erzeugen("data/tpl/kacheln.tpl", fl, function(html) {
var elem = document.querySelector('#dateien');
elem.innerHTML = html;
- //$('.figure').click(fm_dateiwahl);
self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
-
-
});
-
- /*
- 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);
- */
} 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);
@@ -290,7 +258,6 @@
}
}
var pdir = self.fm_get_base(uid);
- // console.log('fm_get_path path: ' + pdir + "/" + restdir);
if (restdir.length > 1) {
return pdir + "/" + restdir;
} else {
@@ -299,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;
@@ -310,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) {
@@ -335,7 +423,6 @@
}
var fl = new FileList(files);
self.fm_render_list(fl);
- //self.fm_render_list(resp);
} else {
// #dateien leeren
var elem = document.querySelector("#dateien");
@@ -343,101 +430,9 @@
}
// Breadcrumb
-
- // Breadcrumb-Ansicht
- //$('.breadcrumb-item').attr('onclick','').unbind('click');
- //$('#bcnav').empty();
- var dirList = new Array();
- var rp = '';
- //console.log("'" + relPfad + "'");
- var dirs = relPfad.split('/');
- //console.log(dirs.length);
- dirList.push(new BcrFile(rp, 'Home'));
- if(relPfad.length > 0) {
- for(var i = 0; i < dirs.length - 1; i++) {
- if(rp.length > 0 ) {
- dirList.push(new BcrFile(rp + '/' + dirs[i], dirs[i]));
- rp = rp + '/' + dirs[i];
- } else {
- dirList.push(new BcrFile(dirs[i], dirs[i]));
- rp = dirs[i];
- }
- }
- var bl = new BcrFiles(dirList);
-
- if(dirList.length > 0) {
- //template = $('#tpl-bcr').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').html(Mustache.render(template, bl));
-
- self.html_erzeugen("data/tpl/bcr.tpl", bl, function(html) {
- var elem = document.querySelector('.breadcrumb');
- elem.innerHTML = html;
- //self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
- });
-
- }
-
- if(dirs.length > 0) {
- dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1]));
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
- self.html_erzeugen("data/tpl/bcr2.tpl", dirList[dirList.length-1], function(html) {
- var elem = document.querySelector('.breadcrumb');
- elem.innerHTML += html;
- //self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
- });
- } else {
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[0]));
- self.html_erzeugen("data/tpl/bcr2.tpl", dirList[0], function(html) {
- var elem = document.querySelector('.breadcrumb');
- elem.innerHTML += html;
- //self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
- });
- }
-
- //$('#bcnav').append($('#tpl-bcr3').html());
- self.html_erzeugen("data/tpl/bcr3.tpl", bl, function(html) {
- var elem = document.querySelector('.breadcrumb');
- elem.innerHTML += html;
- //self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
- });
- } else {
- //self.pfad = '';
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[0]));
- //$('#bcnav').append($('#tpl-bcr3').html());
- self.html_erzeugen("data/tpl/bcr2.tpl", dirList[0], function(html) {
- var elem = document.querySelector('.breadcrumb');
- elem.innerHTML += html;
- //self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
- });
- self.html_erzeugen("data/tpl/bcr3.tpl", dirList[0], function(html) {
- var elem = document.querySelector('.breadcrumb');
- elem.innerHTML += html;
- //self.addEvtListener('.figure', 'click', self.fm_dateiwahl);
- });
- }
- /*
- $('.breadcrumb-item').click(fm_bc_click);
- $('#ansicht').click(fm_ansicht_umschalten);
- fm_set_modus();
-
- if(fm_slideshow) {
- $("[data-fancybox]").fancybox({
- loop: true,
- idleTime: 2
- });
- }
- */
-
- // Breadcrumb
-
+ var dirList = self.fm_buildBreadcrumb(relPfad);
+ self.fm_renderBreadcrumb(dirList);
});
};
@@ -469,16 +464,7 @@
};
this.addEvtListener = function(selector, eventName, func) {
-
document.querySelectorAll(selector).forEach(elem => { elem.addEventListener(eventName, func); });
-
- /*
- var elems = document.querySelectorAll(selector);
- var index;
- for (index = 0; index < elems.length; index++) {
- elems[index].addEventListener(eventName, func);
- }
- */
};
this.removeAllListeners = function(id) {
@@ -508,8 +494,6 @@
self.vorlage_fuellen(vurl, inhalt, cb);
});
};
-
-
/* -------- ajax helper functions ----------- */
--
Gitblit v1.9.3