From 8e238ec465eb1950046076477a32375631e2e0e9 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 20 Jan 2021 19:19:29 +0000
Subject: [PATCH] Upload angepasst
---
web/ui2/js/app.js | 207 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 160 insertions(+), 47 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 99141bf..4824974 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -23,6 +23,7 @@
this.cutCopyOperation;
this.cutCopySrcDir;
this.cutCopyFiles;
+ this.dateien;
this.cache = {}; // mustache template cache
this.datei_neuer_text = function () {
@@ -61,9 +62,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 +100,31 @@
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_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.menue_umschalten = function () {
var ham = document.querySelector(".hamburger");
ham.classList.toggle("is-active"); // hamburger-icon umschalten
@@ -81,7 +133,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 () {
@@ -162,6 +214,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 +229,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();
}
//});
@@ -258,8 +313,8 @@
if(dateiname.endsWith('htmi')) {
self.fm_get_file_content('doc', dateiname);
} else if(dateiname.endsWith('jpg') || dateiname.endsWith('png') ||
- dateiname.endsWith('gif') || dateiname.endsWith('pdf')) {
-
+ dateiname.endsWith('gif') || dateiname.endsWith('pdf') ) {
+ self.fm_view_file();
} else {
self.fm_get_file_content('text', dateiname);
}
@@ -595,7 +650,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() {
@@ -616,22 +671,6 @@
//});
});
});
- /*
- $('#confirmOk').click(function() {
- $('#confirmOk').attr('onclick','').unbind('click');
- fm_del_files();
- });
- $('#confirmOk').text("Loeschen");
- $('#confirmOk').removeClass('btn-primary');
- $('#confirmOk').addClass('btn-danger');
- $('#confirmClose').hide();
- $('#confirmModalTitle').text("Löschen");
- $('#confirmModalBody').text("Wirklich löschen?");
- $('#confirmModal').modal({
- keyboard: false,
- show: true
- });
- */
};
/*
@@ -647,6 +686,7 @@
self.cutCopySrcDir = self.pfad;
self.cutCopyFiles = self.fm_gewaehlte_dateien();
self.cutCopyOperation = 'cut';
+ self.meldung_mit_timeout('zum Ausschneiden in Zwischenablage', 1500);
};
/*
@@ -659,10 +699,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);
};
@@ -674,25 +715,7 @@
* Absenden als Parameter an den Server
*/
this.fm_gewaehlte_dateien = function() {
- //var gewaehlte = $('.datei-gewaehlt');
var gewaehlte = document.querySelectorAll('.datei-gewaehlt');
- /*
- //console.log('anzahl: ' + gewaehlte.length);
- var fnames = new Array();
- var i = 0;
- while(i < gewaehlte.length) {
- var str = { "java.lang.String": $(gewaehlte[i]).text()};
- fnames.push(str);
- //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text());
- //i += 2;
- i++;
- }
- var liste = '{"List":' + JSON.stringify(fnames) + '}';
- // '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
- return liste;
- */
return self.fm_dateiliste_bilden(gewaehlte);
};
@@ -714,6 +737,40 @@
return liste;
};
+ this.fm_menu_datei_umbenennen = function() {
+ //var gewaehlte = $('.datei-gewaehlt');
+ var gewaehlte = document.querySelector('.datei-gewaehlt');
+ var fname = gewaehlte.textContent;
+
+ self.dialog_laden_und_zeigen('data/tpl/dlg-rename.tpl', '', function() {
+ document.querySelector('#cancel-btn').addEventListener('click', function() {
+ self.dialog_schliessen();
+ });
+ document.querySelector('#speichern-btn').addEventListener('click', function() {
+ self.fm_rename_file(fname, self.pfad, document.querySelector('#datei-name-in').value);
+ 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() {
self.fm_export_html();
};
@@ -769,7 +826,23 @@
});
});
};
+
+ this.fm_open_file = function() {
+ var gewaehlte = document.querySelector('.datei-gewaehlt');
+ var fname = gewaehlte.textContent;
+ self.datei_ansehen_oder_bearbeiten(fname);
+ /*
+ if(fname.endsWith('htmi')) {
+ //self.fm_edit_as_doc();
+ self.fm_get_file_content('doc', fname);
+ } else {
+ //self.fm_edit_as_text();
+ self.fm_get_file_content('text', fname);
+ }
+ */
+ };
+ /*
this.fm_edit_as_text = function() {
self.fm_get_sel_for_file_content('text');
};
@@ -778,13 +851,14 @@
self.fm_get_sel_for_file_content('doc');
};
- this.get_sel_for_file_content = function(typ) {
+ this.fm_get_sel_for_file_content = function(typ) {
var gewaehlte = document.querySelector('.datei-gewaehlt');
//var fname = $(gewaehlte).find('.dateiname').text();
var fname = gewaehlte.textContent;
self.fm_get_file_content(typ, fname);
};
+ */
this.fm_get_file_content = function(typ, fname) {
//var gewaehlte = document.querySelector('.datei-gewaehlt');
@@ -825,7 +899,14 @@
}
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);
+ var data = '&p=' + self.pfad + '&p=' + saveFileName + '&p=' +
+ encodeURIComponent(content);
+ // '{"foo": "bar"}'
+
+ //var data = '{"p1": "' + self.pfad + '", "p2": "' + saveFileName +
+ // '", "p3": "' + encodeURIComponent(self.escapeHtml(content)) + '"}';
self.fm_post(u, data, "text", function(resp) {
// ...
});
@@ -868,7 +949,39 @@
});
};
-/* ---- codemirror editor handling -------- */
+ this.fm_rename_file = function(fn, p, neuerName) {
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=renameFile';
+ m = m + '&p=' + p;
+ m = m + '&p=' + fn;
+ m = m + '&p=' + neuerName;
+ var u = '../svc' + m;
+ self.fm_get(u, "text", function(resp) {
+ self.fm_get_list(self.pfad);
+ });
+ };
+
+ /* -------- 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){
@@ -909,7 +1022,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) {
@@ -1164,7 +1277,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