From bf56be31ddaaee5333625e2f5a2e733f7651c7ef Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 21 Jan 2021 18:44:56 +0000
Subject: [PATCH] Ausbau jquery aus foto-ui und umstellung des foto ui auf flex-box, noch in arbeit
---
web/ui2/js/app.js | 193 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 145 insertions(+), 48 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index f7caa3f..5817d1b 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -23,6 +23,8 @@
this.cutCopyOperation;
this.cutCopySrcDir;
this.cutCopyFiles;
+ this.fm_slideshow = false;
+ this.dateien;
this.cache = {}; // mustache template cache
this.datei_neuer_text = function () {
@@ -61,9 +63,35 @@
}
self.seitenleiste_umschalten();
- //fm_init_uploader();
+ self.fm_init_uploader();
self.loc = window.location.protocol + '//' + window.location.host;
};
+
+ /* ----- Uploader Anfang ----------*/
+
+ this.fm_init_uploader = function() {
+ //console.log('init_uploader');
+ self.dateien = new Array();
+ var dropzone = document.getElementById("upload-target");
+ dropzone.ondragover = dropzone.ondragenter = function(event) {
+ event.stopPropagation();
+ event.preventDefault();
+ };
+
+ dropzone.ondrop = function(event) {
+ //console.log('dateien ondrop');
+ event.stopPropagation();
+ event.preventDefault();
+ var fileList = event.dataTransfer.files;
+ for (var i=0; i<fileList.length; i++) {
+ self.dateien.push(fileList[i]);
+ //console.log('upload ' + fileList[i]);
+ }
+ self.sendFile(self.dateien.pop());
+ };
+ };
+
+ /* ----- Uploader Ende --------------- */
this.login_zeigen = function() {
self.meldung_mit_timeout("Benutzer: " + self.userid, 1500);
@@ -73,6 +101,48 @@
window.open('/file-cms/ui2/?pfad=' + self.pfad, '_blank');
};
+ this.fm_hilfe = function() {
+ window.open('/data/dok/wbx-doku.html#wbx-bedienung', '_blank');
+ };
+
+ this.fm_toggle_show_slideshow = function() {
+ if(self.fm_slideshow) {
+ //$('#m-toggle-slideshow').text('Diashow einschalten');
+ self.fm_slideshow = false;
+ } else {
+ //$('#m-toggle-slideshow').text('Diashow ausschalten');
+ self.fm_slideshow = true;
+ }
+ };
+
+ this.fm_view_slideshow = function() {
+
+ // https://localhost:8443/file-cms/fotos/?o=ulrich/bilder/diashow/ordnername
+
+
+ var userid = self.userid; // $('#userMenu').text();
+ //var gewaehlte = $('.datei-gewaehlt');
+ //var gewaehlte = document.querySelector('.datei-gewaehlt');
+ //var fname = gewaehlte.textContent;
+
+ var path = self.fm_get_path(userid);
+ var restdir = path;
+ if(path.indexOf('/data/') > -1) {
+ restdir = path.substr('/data/'.length);
+ }
+
+ //window.open('/file-cms/fotos/?o=' + userid + '/' + path + '/' + fname, '_blank');
+ window.open('/file-cms/fotos/?o=' + restdir + '/' /*+ fname*/, '_blank');
+ };
+
+ this.fm_menu_datei_entpacken = function() {
+ //var gewaehlte = $('.datei-gewaehlt');
+ //var fname = $(gewaehlte[0]).text();
+ var gewaehlte = document.querySelector('.datei-gewaehlt');
+ var fname = gewaehlte.textContent;
+ self.fm_unzip_file(fname);
+ };
+
this.menue_umschalten = function () {
var ham = document.querySelector(".hamburger");
ham.classList.toggle("is-active"); // hamburger-icon umschalten
@@ -81,7 +151,7 @@
this.info_dialog_zeigen = function () {
self.dialog_laden_und_zeigen('data/tpl/dlg-info.tpl', '');
- self.menue_umschalten();
+ //self.menue_umschalten();
};
this.seitenleiste_umschalten = function () {
@@ -107,6 +177,14 @@
}
self.menue_umschalten();
};
+
+ this.fm_fusszeile_zeigen = function() {
+ var suedDiv = document.querySelector('.sued');
+ suedDiv.classList.add('sued-open');
+ suedDiv.style.height = '7em';
+ //$('.sued').show();
+ };
+
this.meldung_mit_timeout = function (meldung, timeout) {
var s = document.querySelector('.sued');
@@ -162,6 +240,7 @@
var fname = self.openFileName;
if(fname !== undefined && fname !== '') {
self.fm_save_file(fname, 'saveTextFile', callback);
+ self.meldung_mit_timeout(fname + ' gespeichert.', 1500);
} else {
self.fm_menu_datei_speichern_unter(callback);
}
@@ -176,9 +255,11 @@
document.querySelector('#speichern-btn').addEventListener('click', function() {
//self.fm_menu_datei_speichern(function() {
//console.log(document.querySelector('#datei-name-in').value);
- self.fm_save_file(document.querySelector('#datei-name-in').value, 'saveTextFileAs', callback);
+ var fname = document.querySelector('#datei-name-in').value;
+ self.fm_save_file(fname, 'saveTextFileAs', callback);
+ self.meldung_mit_timeout(fname + ' gespeichert.', 1500);
if(typeof(callback) !== 'function') {
- self.fm_do_close();
+ //self.fm_do_close();
self.dialog_schliessen();
}
//});
@@ -292,7 +373,8 @@
var elem = ev.target;
if(self.modus == 'kacheln') {
// Kacheln
- var par = elem.parentElement;
+ //var par = elem.parentElement;
+ var par = elem.closest('.datei-figure');
var dElem = par.querySelector('.dateiname');
if(elem.classList.contains("icon-folder")) {
// Ordner
@@ -595,7 +677,7 @@
self.fm_cut_files();
};
this.fm_menu_copy = function() {
- console.log('fm_menu_kopie');
+ //console.log('fm_menu_kopie');
self.fm_copy_files();
};
this.fm_menu_paste = function() {
@@ -631,6 +713,7 @@
self.cutCopySrcDir = self.pfad;
self.cutCopyFiles = self.fm_gewaehlte_dateien();
self.cutCopyOperation = 'cut';
+ self.meldung_mit_timeout('zum Ausschneiden in Zwischenablage', 1500);
};
/*
@@ -643,10 +726,11 @@
* @returns {undefined}
*/
this.fm_copy_files = function() {
- console.log('fm_copy_files');
+ //console.log('fm_copy_files');
self.cutCopySrcDir = self.pfad;
self.cutCopyFiles = self.fm_gewaehlte_dateien();
self.cutCopyOperation = 'copy';
+ self.meldung_mit_timeout('in Zwischenablage kopiert', 1500);
};
@@ -676,7 +760,7 @@
// 'liste' enthaelt:
// {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]}
// und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat
- console.log(liste);
+ //console.log(liste);
return liste;
};
@@ -694,24 +778,6 @@
self.dialog_schliessen();
});
});
-
- /*
- $('#modal_ok').click(function() {
- // hier umbenennen
- fm_rename_file(fname, pfad, $('#dateiname').val());
- });
- $('#saveModalTitle').text('Datei umbenennen');
- $('#dialogfrage').text("Neuer Dateiname?");
-
- if(fname !== undefined) {
- $('#dateiname').val(fname);
- $('#dateiname').attr('placeholder', 'Dateiname');
- $('#saveModal').modal({
- keyboard: false,
- show: true
- });
- }
- */
};
this.fm_menu_html_export = function() {
@@ -769,29 +835,14 @@
});
});
};
-
- this.fm_edit_as_text = function() {
- self.fm_get_sel_for_file_content('text');
- };
- this.fm_edit_as_doc = function() {
- self.fm_get_sel_for_file_content('doc');
- };
-
- this.fm_get_sel_for_file_content = function(typ) {
+ this.fm_open_file = function() {
var gewaehlte = document.querySelector('.datei-gewaehlt');
- //var fname = $(gewaehlte).find('.dateiname').text();
-
var fname = gewaehlte.textContent;
- self.fm_get_file_content(typ, fname);
+ self.datei_ansehen_oder_bearbeiten(fname);
};
-
- this.fm_get_file_content = function(typ, fname) {
- //var gewaehlte = document.querySelector('.datei-gewaehlt');
- //var fname = $(gewaehlte).find('.dateiname').text();
- //var fname = gewaehlte.textContent;
- //console.log('fname: ' + fname);
+ this.fm_get_file_content = function(typ, fname) {
self.openFileName = fname;
var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + self.pfad + '&p=' + fname;
var u = '../svc' + m;
@@ -825,7 +876,8 @@
}
var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method;
var u = '../svc' + m;
- var data = '&p=' + self.pfad + '&p=' + saveFileName + '&p=' + encodeURIComponent(content);
+ var data = '&p=' + self.pfad + '&p=' + saveFileName + '&p=' +
+ encodeURIComponent(content);
self.fm_post(u, data, "text", function(resp) {
// ...
});
@@ -878,8 +930,53 @@
self.fm_get_list(self.pfad);
});
};
+
+ this.fm_unzip_file = function(fn) {
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=extractZipfile';
+ m = m + '&p=' + self.pfad;
+ m = m + '&p=' + fn;
+ var u = '../svc' + m;
+ self.fm_get(u, "text", function(resp) {
+ var mtx = new Meldung('Rueckmeldung vom Entpacken: ' + resp);
+ //console.log(mtx);
+ self.html_erzeugen("data/tpl/fuss.tpl", mtx, function(html) {
+ //console.log(html);
+ var elem = document.querySelector('.sued');
+ elem.innerHTML = html;
+ document.querySelector('.close-btn-fuss').addEventListener('click', function(){
+ var suedDiv = document.querySelector('.sued');
+ document.querySelector('.close-btn-fuss').removeEventListener('click', this);
+ suedDiv.classList.remove('sued-open');
+ suedDiv.style.height = '0';
+ });
+ self.fm_fusszeile_zeigen();
+ self.fm_get_list(self.pfad);
+ });
+ });
+ };
-/* ---- codemirror editor handling -------- */
+ /* -------- upload ----------- */
+
+ this.sendFile = function(datei) {
+ //console.log('sendFile ' + datei);
+ var uri = "../api/upload";
+ var xhr = new XMLHttpRequest();
+ var fd = new FormData();
+ xhr.open("POST", uri, true);
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState === 4 && xhr.status === 200) {
+ self.fm_get_list(self.pfad);
+ if(self.dateien.length > 0) {
+ self.sendFile(self.dateien.pop());
+ }
+ }
+ };
+ fd.append('dateiauswahlfeld', datei);
+ fd.append('pfad', self.pfad);
+ xhr.send(fd);
+ };
+
+ /* ---- codemirror editor handling -------- */
/*
function htmlDecode(value){
@@ -920,7 +1017,7 @@
}
});
//cm.setValue(htmlDecode(content));
- //cm.setValue(content);
+ //self.cm.setValue(content);
self.cm.setValue(self.unescapeHtml(content));
self.cm.getDoc().markClean();
self.cm.on("gutterClick", function(theEditor, lineNumber) {
@@ -1175,7 +1272,7 @@
}
};
xmlhttp.open("POST", url, true);
- xmlhttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+ xmlhttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded; charset=utf-8');
xmlhttp.send(d);
};
--
Gitblit v1.9.3