From 8209533883044451ce7e1742f5a10c4b78679fc3 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 20 Jan 2021 17:48:21 +0000
Subject: [PATCH] Upload und restliche Menuefunktionen, noch in Arbeit
---
web/ui/ui.js | 504 +++++++++++++------------------------------------------
1 files changed, 118 insertions(+), 386 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 8182c68..41a006e 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -31,20 +31,25 @@
var loc;
var PERS_DIR = "Persoenlich";
var PUB_DIR = "Oeffentlich";
+var DAV_DIR = "Austausch";
var BASE_DIR = "$basis";
var DATA_DIR = "$daten";
var WWW_DIR = "www";
var compilerIssues;
+var fm_slideshow = false;
function fm_init() {
$("#mce-editor").hide();
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
+ $('.sued').hide();
//$('.ost').attr('flex-basis', 0);
+ $('#newTab').on('click', fm_newTab);
$('#newTextFile').on('click', fm_menu_neue_textdatei);
$('#newDoc').on('click', fm_menu_neues_dokument);
$('#newFolder').on('click', fm_get_new_folder);
$('#viewFile').on('click', fm_view_file);
+ $('#viewSlideshow').on('click', fm_view_slideshow);
$('#editTextFile').on('click', function() {
fm_get_file_content('text');
});
@@ -55,29 +60,54 @@
$('#saveFileAs').on('click', fm_menu_datei_speichern_unter);
$('#closeFile').on('click', fm_menu_datei_schliessen);
$('#renameFile').on('click', fm_menu_datei_umbenennen);
+ $('#m-zip').on('click', fm_menu_ordner_packen);
+ $('#m-unzip').on('click', fm_menu_datei_entpacken);
+ $('#m-html-export').on('click', fm_menu_html_export);
$('#m-del').on('click', fm_menu_delete);
$('#m-cut').on('click', fm_menu_cut);
$('#m-copy').on('click', fm_menu_copy);
$('#m-paste').on('click', fm_menu_paste);
$('#m-shrink').on('click', fm_menu_shrink);
+ $('#m-rotate').on('click', fm_menu_rotate);
+ $('#m-toggle-slideshow').on('click', fm_toggle_show_slideshow);
$('#m-test').on('click', fm_menu_test);
$('#m-test-2').on('click', fm_menu_compile);
$('#m-test-3').on('click', fm_menu_compile_all);
+ $('#m-compile-results').on('click', fm_fusszeile_zeigen);
+ $('#m-build-app').on('click', fm_menu_build_app);
+ $('#m-ant-build').on('click', fm_menu_ant_build);
$('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
});
$('#logout').click(fm_logout);
+ $('#fusszeile-schliessen').on('click', fm_fusszeile_schliessen);
fm_get_login();
- fm_get_list('');
- fm_init_uploader();
- /*
- console.log('href: ' + window.location.href);
- console.log('host: ' + window.location.host);
- console.log('hostname: ' + window.location.hostname);
- console.log('port: ' + window.location.port);
- console.log('protocol: ' + window.location.protocol);
- */
+ var parsedUrl = new URL(window.location.href);
+ var wunschPfad = parsedUrl.searchParams.get("pfad");
+
+ if(wunschPfad !== null && wunschPfad.length > 0) {
+ pfad = wunschPfad;
+ fm_get_list(wunschPfad);
+ fm_init_uploader();
+ } else {
+ fm_get_list('');
+ fm_init_uploader();
+ }
loc = window.location.protocol + '//' + window.location.host;
+}
+
+function fm_newTab() {
+ window.open('/file-cms/ui/?pfad=' + pfad, '_blank');
+}
+
+function fm_toggle_show_slideshow() {
+ if(fm_slideshow) {
+ $('#m-toggle-slideshow').text('Diashow einschalten');
+ fm_slideshow = false;
+ } else {
+ $('#m-toggle-slideshow').text('Diashow ausschalten');
+ fm_slideshow = true;
+ }
}
function fm_resize_editor() {
@@ -91,6 +121,14 @@
}, 200);
}
+function fm_fusszeile_schliessen() {
+ $('.sued').hide();
+}
+
+function fm_fusszeile_zeigen() {
+ $('.sued').show();
+}
+
function fm_get_path(uid) {
//console.log('pfad: ' + pfad);
var restdir;
@@ -102,6 +140,8 @@
restdir = pfad.substr(BASE_DIR.length);
} else if(pfad.indexOf(DATA_DIR) > -1) {
restdir = pfad.substr(DATA_DIR.length);
+ } else if(pfad.indexOf(DAV_DIR) > -1) {
+ restdir = pfad.substr(DAV_DIR.length);
}
if(restdir !== undefined && restdir.startsWith('/')) {
restdir = restdir.substr(1);
@@ -160,8 +200,8 @@
selector: "textarea.text-editor",
statusbar: false,
menubar: false,
- plugins: 'advlist charmap code image link lists media print preview save table textcolor importcss',
- toolbar: 'undo redo | styleselect | image | link unlink | bullist numlist | outdent indent | code',
+ plugins: 'advlist charmap code image link lists media table print preview save table textcolor importcss',
+ toolbar: 'undo redo | styleselect | image table | link unlink | bullist numlist | outdent indent | code',
/*
menu: {
file: {title: 'File', items: 'savevers | exit'},
@@ -207,24 +247,6 @@
};
}
-function 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) {
- fm_get_list(pfad);
- if(dateien.length > 0) {
- sendFile(dateien.pop());
- }
- }
- };
- fd.append('dateiauswahlfeld', datei);
- fd.append('pfad', pfad);
- xhr.send(fd);
-}
-
/* ----- Uploader Ende --------------- */
/* ------- Dateifunktionen Start ----------- */
@@ -266,6 +288,7 @@
*/
function fm_gewaehlte_dateien() {
var gewaehlte = $('.datei-gewaehlt');
+ /*
//console.log('anzahl: ' + gewaehlte.length);
var fnames = new Array();
var i = 0;
@@ -281,7 +304,31 @@
// {"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 fm_dateiliste_bilden(gewaehlte);
}
+
+function fm_dateiliste_bilden(gewaehlte) {
+ 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;
+}
+
+function fm_menu_html_export() {
+ fm_export_html();
+}
+
/* --------- Dateifunktionen Ende ---------- */
function fm_menu_test() {
@@ -302,10 +349,19 @@
fm_compile_all();
}
+function fm_menu_build_app() {
+ fm_build_app();
+}
+
+function fm_menu_ant_build() {
+ fm_ant_build();
+}
+
function fm_mark_compile_results_in_editor(resp) {
cm.clearGutter("breakpoints");
if(resp.List[0].CompilerIssue !== undefined) {
+ cm.setGutterMarker(0, "breakpoints", makeMarker("Code hat Fehler"));
var lno;
var eMsg;
if(resp.List[0].CompilerIssue instanceof Array) {
@@ -326,42 +382,6 @@
cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg));
}
}
-}
-
-function fm_compile_all() {
- var m = '?c=de.uhilger.filecms.api.CompileService&m=compileAll&p=' + pfad;
- var u = '../svc' + m;
- fm_get(u, "json", function(resp) {
- if(resp.List[0].CompilerIssue !== undefined) {
- var lno;
- var eMsg;
- if(resp.List[0].CompilerIssue instanceof Array) {
- var issueNo = 0;
- while(issueNo < resp.List[0].CompilerIssue.length) {
- console.log(' +++ ---- +++ ');
- console.log(resp.List[0].CompilerIssue[issueNo].kind);
- console.log(resp.List[0].CompilerIssue[issueNo].lineNumber);
- console.log(resp.List[0].CompilerIssue[issueNo].sourceName);
- console.log(resp.List[0].CompilerIssue[issueNo].message);
- issueNo++;
- }
- } else {
- lno = resp.List[0].CompilerIssue.lineNumber;
- eMsg = resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message;
- console.log(lno + ' ' + eMsg);
- }
- }
- });
-}
-
-function fm_compile(modeStr, callback) {
- var liste = fm_gewaehlte_dateien();
- var m = '?c=de.uhilger.filecms.api.CompileService&m=compile&p=' + pfad + '&p=' + encodeURIComponent(liste) +
- '&p=' + modeStr;
- var u = '../svc' + m;
- fm_get(u, "json", function(resp) {
- callback(resp);
- });
}
function fm_ansicht_umschalten() {
@@ -555,59 +575,7 @@
}
/* ----- API Calls ------------- */
-function fm_get_login() {
- var m = '?c=de.uhilger.filecms.pub.SessionManager&m=getSessionUser';
- var u = '../pub' + m;
- fm_get(u, "text", function(resp) {
- userid = resp;
- $('#userMenu').text(resp);
- });
-}
-function fm_get_new_folder() {
- $('#modal_ok').click(function() {
- // hier speichern
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=newFolder&p=' + pfad + '&p=' + $('#dateiname').val();
- var u = '../svc' + m;
- fm_get(u, "json", function(resp) {
- fm_get_list(pfad);
- });
- });
- $('#saveModalTitle').text('Neuer Ordner');
- $('#dialogfrage').text("Name?");
- $('#dateiname').val('');
- $('#dateiname').attr('placeholder', 'Ordnername');
- $('#saveModal').modal({
- keyboard: false,
- show: true
- });
-}
-
-function fm_get_file_content(typ) {
- var gewaehlte = $('.datei-gewaehlt');
- //var fname = $(gewaehlte).find('.dateiname').text();
-
- var fname = $(gewaehlte[0]).text();
- openFileName = fname;
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname;
- var u = '../svc' + m;
- fm_get(u, "text", function(resp) {
- if(typ == 'text') {
- var mode = "text/x-java";
- if(fname.endsWith('js')) {
- mode = 'javascript';
- } else if(fname.endsWith('xml')) {
- mode = 'xml';
- } else if(fname.endsWith('properties')) {
- mode = 'xml';
- }
- fm_text_edit(resp, mode);
- } else {
- fm_dok_edit(resp);
- }
- });
-
-}
function fm_view_file() {
// http://localhost:8080/file-cms/ui/#
@@ -620,6 +588,25 @@
var path = fm_get_path(userid);
window.open(path + '/' + fname, '_blank');
+}
+
+function fm_view_slideshow() {
+
+ // https://localhost:8443/file-cms/fotos/?o=ulrich/bilder/diashow/ordnername
+
+
+ var userid = $('#userMenu').text();
+ var gewaehlte = $('.datei-gewaehlt');
+ var fname = $(gewaehlte[0]).text();
+
+ var path = 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');
}
function fm_menu_datei_umbenennen() {
@@ -643,27 +630,21 @@
}
}
-function fm_rename_file(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;
- fm_get(u, "text", function(resp) {
- fm_get_list(pfad);
- });
-}
-
-function fm_menu_shrink() {
+function fm_menu_datei_entpacken() {
var gewaehlte = $('.datei-gewaehlt');
var fname = $(gewaehlte[0]).text();
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=bildVerkleinern';
- m = m + '&p=' + pfad;
- m = m + '&p=' + fname;
- var u = '../svc' + m;
- fm_get(u, "text", function(resp) {
- fm_get_list(pfad);
- });
+ fm_unzip_file(fname);
+}
+
+/**
+ * Anname: Man ist in dem Ordner, der gepackt werden soll.
+ * Dann ist das Archiv anschliessend im Eltern-Ordner.
+ */
+function fm_menu_ordner_packen() {
+ //var gewaehlte = $('.datei-gewaehlt');
+ //var fname = $(gewaehlte[0]).text();
+ //console.log("Pfad: " + pfad + ", Datei: " + fname);
+ fm_pack_folder();
}
/*
@@ -695,42 +676,6 @@
cutCopyOperation = 'copy';
}
-/*
- * Hier wird fuer eine zuvor markierte Liste von Dateien, fuer die
- * Cut oder Copy gewaehlt wurde, die Operations ausgefuehrt (move oder copy)
- * @returns {undefined}
- */
-function fm_paste_files() {
- var m;
- if(cutCopyOperation === 'cut') {
- //m = '?c=de.uhilger.filecms.api.FileMgr&m=moveFiles'; //&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(liste);
- m = '?c=de.uhilger.filecms.api.FileMgr&m=moveFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles);
- } else {
- //m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles'; //&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(liste);
- m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles);
- }
- var u = '../svc' + m;
- fm_get(u, "text", function(resp) {
- // console.log('deleteFiles gab folgendes zurueck: ' + resp);
- fm_get_list(pfad);
- });
- /*
- fm_post(u, {p1: encodeURIComponent(cutCopySrcDir), p2: encodeURIComponent(pfad), p3: encodeURIComponent(cutCopyFiles)},'text', function(resp) {
- // resp evtl. zeigen..
- fm_get_list(pfad);
- });
- */
-}
-
-function fm_del_files() {
- var liste = fm_gewaehlte_dateien();
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=deleteFiles&p=' + pfad + '&p=' + encodeURIComponent(liste);
- var u = '../svc' + m;
- fm_get(u, "text", function(resp) {
- // console.log('deleteFiles gab folgendes zurueck: ' + resp);
- fm_get_list(pfad);
- });
-}
function fm_render_list(fl) {
if(modus == 'kacheln') {
@@ -771,81 +716,6 @@
*/
}
-// http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p=
-function fm_get_list(relPfad) {
- $('#ansicht').attr('onclick','').unbind('click');
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad;
- var u = '../svc' + m;
- fm_get(u, "json", function(resp) {
-
- if(resp.List[0].FileRef !== undefined) {
- var files = new Array();
- if(resp.List[0].FileRef instanceof Array) {
- for(var i = 0; i < resp.List[0].FileRef.length; i++) {
- files.push(new FileRef(resp.List[0].FileRef[i]));
- }
- } else {
- files.push(new FileRef(resp.List[0].FileRef));
- }
- var fl = new FileList(files);
- fm_render_list(fl);
- } else {
- $('#dateien').empty();
- }
-
- // Breadcrumb-Ansicht
- var template;
- $('.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));
- }
-
- 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]));
- } else {
- template = $('#tpl-bcr2').html();
- Mustache.parse(template); // optional, speeds up future uses
- $('#bcnav').append(Mustache.render(template, dirList[0]));
- }
-
- $('#bcnav').append($('#tpl-bcr3').html());
- } else {
- 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());
- }
- $('.breadcrumb-item').click(fm_bc_click);
- $('#ansicht').click(fm_ansicht_umschalten);
- fm_set_modus();
- });
-}
-
function fm_menu_datei_speichern(callback) {
//var fname = $('.datei-gewaehlt').text();
var fname = openFileName;
@@ -856,27 +726,6 @@
}
}
-function fm_save_file(saveFileName, method, callback) {
- var content;
- if(openEditor === 'text') {
- content = cm.getValue();
- cm.getDoc().markClean();
- } else {
- content = ed.getContent();
- tinymce.activeEditor.undoManager.clear();
- }
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method;
- var u = '../svc' + m;
- fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) {
- // hier scheint nichts zurueckzukommen..
- });
- openFileName = saveFileName;
- if(typeof (callback) !== 'function') {
-
- } else {
- callback();
- }
-}
function fm_menu_datei_speichern_unter(callback) {
$('#modal_ok').click(function() {
@@ -900,15 +749,6 @@
});
}
-function fm_logout() {
- var m = '?c=de.uhilger.filecms.pub.SessionManager&m=expireSession';
- var u = '../pub' + m;
-
- fm_get(u, "text", function(resp) {
- $('#userMenu').text('nicht angemeldet');
- window.location.href = '../logout.html';
- });
-}
/* ---- codemirror editor handling -------- */
@@ -922,6 +762,7 @@
function fm_code_edit(content, m) {
cm = CodeMirror.fromTextArea(document.getElementById("editspace"), {
lineNumbers: true,
+ lineWrapping: true,
gutters: ["CodeMirror-linenumbers", "breakpoints"],
mode: m,
viewportMargin : Infinity,
@@ -982,38 +823,6 @@
/* -------- helper functions ----------- */
-function fm_get(u, dtype, scallback) {
- $.ajax({
- url: u,
- type: "GET",
- dataType: dtype,
- success: scallback,
- error: function (xhr, status, errorThrown) {
- alert("Error: " + errorThrown + " Status: " + status + " URL: " + u);
- },
- complete: function (xhr, status) {
- //console.log( "The request is complete!" );
- }
-
- });
-}
-
-function fm_post(u, d, dtype, scallback) {
- $.ajax({
- url: u,
- data: d,
- type: "POST",
- dataType: dtype,
- success: scallback,
- error: function (xhr, status, errorThrown) {
- $('#fehler').html("Error: " + errorThrown + " Status: " + status);
- },
- complete: function (xhr, status) {
- //alert( "The request is complete!" );
- }
- });
-}
-
function fm_serialise(obj) {
return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}';
}
@@ -1042,81 +851,4 @@
return text;
}
-
-/* ----- Objekte ----- */
-
-function FileList(fl) {
- this.files = fl;
-}
-
-function FileRef(obj) {
- var self = this;
- this.fr = obj;
- this.fnx;
-
- this.typeClass = function() {
- if(modus == 'kacheln') {
- if(self.fr.isDirectory) {
- return 'fa-folder ordner';
- } else {
- return 'fa-file datei';
- }
- } else {
- if(self.fr.isDirectory) {
- return 'fa-folder ordner';
- } else {
- return 'fa-file-o datei';
- }
- }
- };
-
- this.mini = function() {
- var miniatur = false;
- var namen = self.fr.absolutePath.split('/');
- if(namen.length > 0) {
- self.fnx = decodeURIComponent(namen[namen.length - 1]);
- } else {
- self.fnx = decodeURIComponent(self.fr.absolutePath);
- }
- if(self.fnx.indexOf('.jpg') > -1 || self.fnx.indexOf('.png') > -1 || self.fnx.indexOf('.gif') > -1 || self.fnx.indexOf('.jpeg') > -1) {
- miniatur = true;
- }
- return miniatur;
- };
-
- this.miniurl = function() {
- var userid = $('#userMenu').text();
- var ext = '';
- var dotpos = self.fnx.indexOf('.');
- if(dotpos > -1) {
- var fny = self.fnx;
- self.fnx = self.fnx.substring(0, dotpos);
- ext = fny.substr(dotpos);
- }
- var path = fm_get_path(userid);
- var imgurl = loc + path + '/' + self.fnx + '_tn' + ext;
- return imgurl;
-
- };
-
- this.fileName = function() {
-
- var namen = self.fr.absolutePath.split('/');
- if(namen.length > 0) {
- return decodeURIComponent(namen[namen.length - 1]);
- } else {
- return decodeURIComponent(self.fr.absolutePath);
- }
-
- };
-}
-
-function BcrFiles(fl) {
- this.files = fl;
-}
-
-function BcrFile(rp, n) {
- this.relPath = rp;
- this.fName = n;
-}
--
Gitblit v1.9.3