From c980bb439a1685510b1b479669761a93f0d8c5b0 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sat, 25 Feb 2017 17:32:26 +0000 Subject: [PATCH] Mustache Templates ausgelagert (noch in Arbeit) --- web/ui/ui.js | 340 +++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 227 insertions(+), 113 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 9b5147e..e20c80b 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'; @@ -13,6 +31,7 @@ $('#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'); @@ -25,9 +44,7 @@ /* ----- Uploader Anfang ----------*/ -var idNr; var dateien = new Array(); -var sendet = false; function fm_init_uploader() { var dropzone = document.getElementById("dateien"); @@ -37,82 +54,58 @@ }; dropzone.ondrop = function(event) { - console.log('drop ' + event.dataTransfer.files[0]); event.stopPropagation(); event.preventDefault(); - - var filesArray = event.dataTransfer.files; - for (var i=0; i<filesArray.length; i++) { - //sendFile(filesArray[i]); - var datei = new Datei(++idNr, filesArray[i]); - dateien.push(datei); - dateiListen(datei); - } - naechsteDatei(); + var fileList = event.dataTransfer.files; + for (var i=0; i<fileList.length; i++) { + dateien.push(fileList[i]); + } + sendFile(dateien.pop()); }; } -function dateiListen(d) { - $('.ost').append(d.file.name); -} - -function naechsteDatei() { - if(!sendet && dateien.length > 0) { - sendFile(dateien.pop()); - } -} - function sendFile(datei) { - - // Dateitabelle ergaenzen - /* - var elem = document.getElementById('dateitabelle'); - var tr = document.createElement('tr'); - var td = document.createElement('td'); - td.innerHTML = file.name; - tr.appendChild(td); - td = document.createElement('td'); - td.innerHTML = 'wird hochgeladen..'; - tr.appendChild(td); - elem.appendChild(tr); - */ - - //doNotImplemented(); - // Datei senden - var uri = "../api/upload"; // "../api/UploadFile"; //"/index.php"; + var uri = "../api/upload"; var xhr = new XMLHttpRequest(); var fd = new FormData(); - - sendet = true; xhr.open("POST", uri, true); xhr.onreadystatechange = function() { if (xhr.readyState == 4 && xhr.status == 200) { - //var td = document.getElementById('dateizeile' + datei.nr); - // Handle response. - //td.innerHTML = 'hochladen beendet'; - //alert(xhr.responseText + ' ' + index); // handle response. - sendet = false; - //window.setTimeout(function() { fm_get_list(pfad); - naechsteDatei(); - //}, 1000); + if(dateien.length > 0) { + sendFile(dateien.pop()); + } } }; - fd.append('dateiauswahlfeld', datei.file); - // Initiate a multipart/form-data upload + fd.append('dateiauswahlfeld', datei); xhr.send(fd); -} - -function Datei (n, d) { - this.nr = n; - this.file = d; } /* ----- 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(); - console.log('.ost.width: ' + w); if(w == 0) { $('.ost').width('20%'); $('.ost').text('Hallo Welt!'); @@ -159,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); } } } @@ -233,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'); @@ -244,7 +258,10 @@ } 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; @@ -254,23 +271,50 @@ } +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); + }); + +} + function fm_render_list(fl) { if(modus == 'kacheln') { // Kachelansicht - var template = $('#tpl-kacheln').html(); - Mustache.parse(template); // optional, speeds up future uses + $.get('tpl-kacheln.txt', function(template) { + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.figure').click(fm_dateiwahl); + }); $('.datei-zeile').attr('onclick','').unbind('click'); - $('#dateien').empty(); - $('#dateien').html(Mustache.render(template, fl)); - $('.figure').click(fm_dateiwahl); } else { // Listenansicht - var template = $('#tpl-liste').html(); - Mustache.parse(template); // optional, speeds up future uses + $.get('tpl-liste.txt', function(template) { + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.datei-zeile').click(fm_dateiwahl); + }); $('.figure').attr('onclick','').unbind('click'); - $('#dateien').empty(); - $('#dateien').html(Mustache.render(template, fl)); - $('.datei-zeile').click(fm_dateiwahl); } } @@ -297,7 +341,7 @@ } // Breadcrumb-Ansicht - var template; + //var template; $('.breadcrumb-item').attr('onclick','').unbind('click'); $('#bcnav').empty(); var dirList = new Array(); @@ -318,35 +362,105 @@ } 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])); + if(dirList.length > 0) { + $.get('tpl-bcr.txt', function(template) { + $('#bcnav').html(Mustache.render(template, bl)); + //fm_bcr_step2(dirs, dirList); + + if(dirs.length > 0) { + dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //template = $('#tpl-bcr2').html(); + //Mustache.parse(template); // optional, speeds up future uses + //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); + } else { + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //template = $('#tpl-bcr2').html(); + //Mustache.parse(template); // optional, speeds up future uses + //$('#bcnav').append(Mustache.render(template, dirList[0])); + } + + }); } else { - template = $('#tpl-bcr2').html(); - Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').append(Mustache.render(template, dirList[0])); + //fm_bcr_step2(dirs, dirList); + /* + if(dirs.length > 0) { + dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //template = $('#tpl-bcr2').html(); + //Mustache.parse(template); // optional, speeds up future uses + //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); + } else { + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //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()); + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //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(); + //$('.breadcrumb-item').click(fm_bc_click); + //$('#ansicht').click(fm_ansicht_umschalten); + //fm_set_modus(); }); +} + +/* +function fm_bcr_step2(dirs, dirList) { + if(dirs.length > 0) { + dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //template = $('#tpl-bcr2').html(); + //Mustache.parse(template); // optional, speeds up future uses + //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); + } else { + $.get('tpl-bcr2.txt', function(template) { + $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#bcnav').append($('#tpl-bcr3').html()); + fm_bcr_end(); + }); + //template = $('#tpl-bcr2').html(); + //Mustache.parse(template); // optional, speeds up future uses + //$('#bcnav').append(Mustache.render(template, dirList[0])); + } +} +*/ + +function fm_bcr_end() { + $('.breadcrumb-item').click(fm_bc_click); + $('#ansicht').click(fm_ansicht_umschalten); + fm_set_modus(); } function fm_menu_datei_speichern() { @@ -380,7 +494,7 @@ }); */ }); - $('.modal-title').text('Datei speichern'); + $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); var fname = $('.datei-gewaehlt').text(); @@ -479,15 +593,15 @@ this.typeClass = function() { if(modus == 'kacheln') { if(self.fr.isDirectory) { - return 'fa-folder'; + return 'fa-folder ordner'; } else { - return 'fa-file'; + return 'fa-file datei'; } } else { if(self.fr.isDirectory) { - return 'fa-folder'; + return 'fa-folder ordner'; } else { - return 'fa-file-o'; + return 'fa-file-o datei'; } } }; -- Gitblit v1.9.3