From 957b51e11ef0f1929fba793cf250763be0a30417 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 25 Feb 2017 15:29:16 +0000
Subject: [PATCH] Loeschen verfeinert
---
web/ui/ui.js | 185 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 166 insertions(+), 19 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 85524b4..0547019 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -1,3 +1,21 @@
+/*
+ Dateiverwaltung - File management in your browser
+ Copyright (C) 2017 Ulrich Hilger, http://uhilger.de
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
var cm;
var pfad = '';
var modus = 'kacheln';
@@ -6,18 +24,95 @@
function fm_init() {
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
+ //$('.ost').attr('flex-basis', 0);
$('#newTextFile').on('click', fm_menu_neue_textdatei);
$('#newFolder').on('click', fm_get_new_folder);
$('#editTextFile').on('click', fm_get_file_content);
$('#saveFile').on('click', fm_menu_datei_speichern);
$('#saveFileAs').on('click', fm_menu_datei_speichern_unter);
$('#closeFile').on('click', fm_menu_datei_schliessen);
+ $('#m-del').on('click', fm_menu_delete);
+ $('#m-test').on('click', fm_menu_test);
$('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
});
$('#logout').click(fm_logout);
fm_get_login();
fm_get_list('');
+ fm_init_uploader();
+}
+
+/* ----- Uploader Anfang ----------*/
+
+var dateien = new Array();
+
+function fm_init_uploader() {
+ var dropzone = document.getElementById("dateien");
+ dropzone.ondragover = dropzone.ondragenter = function(event) {
+ event.stopPropagation();
+ event.preventDefault();
+ };
+
+ dropzone.ondrop = function(event) {
+ event.stopPropagation();
+ event.preventDefault();
+ var fileList = event.dataTransfer.files;
+ for (var i=0; i<fileList.length; i++) {
+ dateien.push(fileList[i]);
+ }
+ sendFile(dateien.pop());
+ };
+}
+
+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);
+ xhr.send(fd);
+}
+
+/* ----- Uploader Ende --------------- */
+
+function fm_menu_delete() {
+ $('#confirmOk').click(function() {
+ // hier loeschen
+ fm_del_files();
+ });
+ $('#confirmModalTitle').text("Löschen");
+ $('#confirmModalBody').text("Wirklich löschen?");
+
+ /*var fname = $('.datei-gewaehlt').text();
+ if(fname !== undefined) {
+ $('#dateiname').val(fname);
+ } else {
+ $('#dateiname').val('');
+ }*/
+ //$('#dateiname').attr('placeholder', 'Dateiname');
+ $('#confirmModal').modal({
+ keyboard: false,
+ show: true
+ });
+}
+
+function fm_menu_test() {
+ var w = $('.ost').width();
+ if(w == 0) {
+ $('.ost').width('20%');
+ $('.ost').text('Hallo Welt!');
+ } else {
+ $('.ost').empty();
+ $('.ost').width(0);
+ }
}
function fm_ansicht_umschalten() {
@@ -57,37 +152,58 @@
fm_get_list(pfad);
}
-function fm_dateiwahl() {
+function fm_dateiwahl(ev) {
var elem = this;
+ //console.log('dateiwahl nach click, event shift: ' + ev.shiftKey + ", event ctrl: " + ev.ctrlKey);
if(modus == 'kacheln') {
+ // Kacheln
if($(elem).children(0).hasClass('fa-folder')) {
- var ordner = $(elem).text().trim();
- if(pfad.length > 0) {
- pfad = pfad + '/' + ordner;
+ if(/*ev.shiftKey || */ ev.ctrlKey) {
+ $(elem).find('.dateiname').addClass('datei-gewaehlt');
} else {
- pfad = ordner;
+ var ordner = $(elem).text().trim();
+ if(pfad.length > 0) {
+ pfad = pfad + '/' + ordner;
+ } else {
+ pfad = ordner;
+ }
+ fm_get_list(pfad);
}
- fm_get_list(pfad);
} else if($(elem).children(0).hasClass('fa-file')) {
- $('.datei-gewaehlt').removeClass('datei-gewaehlt');
- $(elem).children(0).addClass('datei-gewaehlt');
+ if(/*ev.shiftKey || */ ev.ctrlKey) {
+ // mehrere Dateien sollen gewaehlt werden
+ } else {
+ $('.datei-gewaehlt').removeClass('datei-gewaehlt');
+ }
+ $(elem).find('.dateiname').addClass('datei-gewaehlt');
} else {
//console.log('kein folder oder file...');
}
} else {
+ // Liste
if($(elem).find('.datei-elem').children(0).hasClass('fa-file-o')) {
- $('.table-info').removeClass('table-info');
+ // Datei
+ if(/*ev.shiftKey || */ ev.ctrlKey) {
+ // mehrere Dateien sollen gewaehlt werden
+ } else {
+ $('.table-info').removeClass('table-info');
+ $('.datei-gewaehlt').removeClass('datei-gewaehlt');
+ }
$(elem).addClass('table-info');
- $('.datei-gewaehlt').removeClass('datei-gewaehlt');
$(elem).find('.dateiname').addClass('datei-gewaehlt');
} else {
- var ordner = $(elem).find('.dateiname').text();
- if(pfad.length > 0) {
- pfad = pfad + '/' + ordner;
+ // Ordner
+ if(/*ev.shiftKey || */ ev.ctrlKey) {
+ $(elem).children(0).addClass('datei-gewaehlt');
} else {
- pfad = ordner;
+ var ordner = $(elem).find('.dateiname').text();
+ if(pfad.length > 0) {
+ pfad = pfad + '/' + ordner;
+ } else {
+ pfad = ordner;
+ }
+ fm_get_list(pfad);
}
- fm_get_list(pfad);
}
}
}
@@ -131,7 +247,7 @@
fm_get_list(pfad);
});
});
- $('.modal-title').text('Neuer Ordner');
+ $('#saveModalTitle').text('Neuer Ordner');
$('#dialogfrage').text("Name?");
$('#dateiname').val('');
$('#dateiname').attr('placeholder', 'Ordnername');
@@ -142,12 +258,42 @@
}
function fm_get_file_content() {
- var fname = $('.datei-gewaehlt').text();
+ 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) {
fm_text_edit(resp);
+ });
+
+}
+
+function fm_del_files() {
+ var gewaehlte = $('.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
+
+ 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);
});
}
@@ -278,7 +424,7 @@
});
*/
});
- $('.modal-title').text('Datei speichern');
+ $('#saveModalTitle').text('Datei speichern');
$('#dialogfrage').text("Dateiname?");
var fname = $('.datei-gewaehlt').text();
@@ -407,4 +553,5 @@
function BcrFile(rp, n) {
this.relPath = rp;
this.fName = n;
-}
\ No newline at end of file
+}
+
--
Gitblit v1.9.3