From fc1897413a5142e53ddd71944e6acd08dd183869 Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 25 Feb 2017 14:33:42 +0000
Subject: [PATCH] Loeschen implementiert
---
web/ui/ui.js | 235 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 169 insertions(+), 66 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index e24ebdb..b4e6872 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -1,26 +1,121 @@
+/*
+ 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';
+var openFileName = '';
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_menu_neuer_ordner);
+ $('#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();
+ });
+ $('.modal-title').text("Löschen");
+ $('.modal-body').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() {
- //console.log('hat th-list: ' + $('#ansicht').children(0).hasClass('fa-th-list'));
- //console.log('hat th-large: ' + $('#ansicht').children(0).hasClass('fa-th-large'));
if($('#ansicht').children(0).hasClass('fa-th-list')) {
$('#ansicht').children(0).addClass('fa-th-large');
$('#ansicht').children(0).removeClass('fa-th-list');
@@ -44,27 +139,22 @@
}
function fm_menu_neue_textdatei() {
- /*
- $('#dateiansicht').hide();
- $('.codeeditor-space').show();
- $('.code-editor-container').show();
- fm_code_edit('Test');
- */
- fm_text_edit('Test');
+ fm_text_edit('Neue Datei');
}
function fm_menu_datei_schliessen() {
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
cm.toTextArea();
- $('#dateiansicht').show();
+ $('#bcnav').show();
+ $('#dateien').show();
+ openFileName = '';
+ fm_get_list(pfad);
}
-function fm_dateiwahl() {
+function fm_dateiwahl(ev) {
var elem = this;
- //console.log('kachel datei gewaehlt ' + $(elem).text().trim());
- //console.log('liste datei gewaehlt ' + $(elem).children(1).text());
- //console.log('dateiname: ' + $(elem).find('.dateiname').text());
+ //console.log('dateiwahl nach click, event shift: ' + ev.shiftKey + ", event ctrl: " + ev.ctrlKey);
if(modus == 'kacheln') {
if($(elem).children(0).hasClass('fa-folder')) {
var ordner = $(elem).text().trim();
@@ -75,14 +165,22 @@
}
fm_get_list(pfad);
} else if($(elem).children(0).hasClass('fa-file')) {
- $('.datei-gewaehlt').removeClass('datei-gewaehlt');
+ if(/*ev.shiftKey || */ ev.ctrlKey) {
+ // mehrere Dateien sollen gewaehlt werden
+ } else {
+ $('.datei-gewaehlt').removeClass('datei-gewaehlt');
+ }
$(elem).children(0).addClass('datei-gewaehlt');
} else {
//console.log('kein folder oder file...');
}
} else {
if($(elem).find('.datei-elem').children(0).hasClass('fa-file-o')) {
- $('.table-info').removeClass('table-info');
+ if(/*ev.shiftKey || */ ev.ctrlKey) {
+ // mehrere Dateien sollen gewaehlt werden
+ } else {
+ $('.table-info').removeClass('table-info');
+ }
$(elem).addClass('table-info');
$('.datei-gewaehlt').removeClass('datei-gewaehlt');
$(elem).find('.dateiname').addClass('datei-gewaehlt');
@@ -98,14 +196,9 @@
}
}
-function fm_menu_neuer_ordner() {
- fm_get_new_folder();
-}
-
function fm_bc_click() {
var elem = this;
var bcPfad = $(elem).attr('rpath');
- //console.log(relPath);
if(bcPfad !== undefined) {
pfad = bcPfad;
fm_get_list(bcPfad);
@@ -113,13 +206,11 @@
pfad = '';
fm_get_list('');
}
-
-
- //console.log($(elem).text() + ' ' + $(elem).attr('rpath') + ' ' + $(elem).hasClass('active'));
}
function fm_text_edit(content) {
- $('#dateiansicht').hide();
+ $('#bcnav').hide();
+ $('#dateien').hide();
$('.codeeditor-space').show();
$('.code-editor-container').show();
fm_code_edit(content);
@@ -141,16 +232,8 @@
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);
});
-
- /*
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
- var u = '../svc' + m;
- fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) {
-
- });
- */
});
$('.modal-title').text('Neuer Ordner');
$('#dialogfrage').text("Name?");
@@ -163,27 +246,44 @@
}
function fm_get_file_content() {
-
- var fname = $('.datei-gewaehlt').text();
-
- //console.log(pfad + '/' + fname);
-
+ var gewaehlte = $('.datei-gewaehlt');
+ var fname = $(gewaehlte[1]).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) {
- /*
- $('#dateiansicht').hide();
- $('.codeeditor-space').show();
- $('.code-editor-container').show();
- fm_code_edit(resp);
- */
fm_text_edit(resp);
});
}
+function fm_del_files() {
+ var gewaehlte = $('.datei-gewaehlt');
+ //console.log('anzahl: ' + gewaehlte.length);
+ var fnames = new Array();
+ var i = 1;
+ while(i < gewaehlte.length) {
+ var str = { "java.lang.String": $(gewaehlte[i]).text()};
+ fnames.push(str);
+ //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text());
+ i += 2;
+ }
+
+ 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>]
+
+ 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($('#ansicht').children(0).hasClass('fa-th-list')) {
if(modus == 'kacheln') {
// Kachelansicht
var template = $('#tpl-kacheln').html();
@@ -279,14 +379,35 @@
}
function fm_menu_datei_speichern() {
+ //var fname = $('.datei-gewaehlt').text();
+ var fname = openFileName;
+ if(fname !== undefined && fname !== '') {
+ fm_save_file(fname);
+ } else {
+ fm_menu_datei_speichern_unter();
+ }
+}
+
+function fm_save_file(saveFileName) {
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
+ var u = '../svc' + m;
+ fm_post(u, {p1: pfad, p2: saveFileName, p3: cm.getValue()}, function(resp) {
+ openFileName = saveFileName;
+ });
+}
+
+function fm_menu_datei_speichern_unter() {
$('#modal_ok').click(function() {
// hier speichern
+ fm_save_file($('#dateiname').val());
+ /*
var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
var u = '../svc' + m;
fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) {
});
+ */
});
$('.modal-title').text('Datei speichern');
$('#dialogfrage').text("Dateiname?");
@@ -302,21 +423,6 @@
keyboard: false,
show: true
});
-
-
- // FileRef saveTextFile(String relPath, String fileName, String contents)
-
-
- /*
- var t = new Template(-2, $('#filename').val(), self.cm.getValue(), 3);
- var u = '../api/tr/?c=de.uhilger.webbox.api.ContentApi&m=newTemplate';
- self.post(u, {p: self.serialise(t)}, function (resp) {
- self.isnew = false;
- self.editid = resp.Template.id;
- $('#contlist').append(self.buildContListItem(3, resp.Template.name, resp.Template.id));
- $('#templateeditor').addClass('hidden');
- });
- */
}
function fm_logout() {
@@ -333,10 +439,6 @@
/* ---- codemirror editor handling -------- */
function fm_code_edit(content) {
- //var windowHeight = $(window).height();
- //$("editspace").empty();
- //self.cm.toTextArea();
-
cm = CodeMirror.fromTextArea(document.getElementById("editspace"), {
lineNumbers: true,
mode: "xml",
@@ -437,3 +539,4 @@
this.relPath = rp;
this.fName = n;
}
+
--
Gitblit v1.9.3