From 7aa5665ab6b2bb72582713eda9534a02f7b3c50a Mon Sep 17 00:00:00 2001 From: Ulrich <undisclosed> Date: Thu, 23 Feb 2017 16:50:10 +0000 Subject: [PATCH] erste Rohfassung der Upload-Funktion laeuft --- web/ui/ui.js | 304 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 226 insertions(+), 78 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index f4dcedf..9b5147e 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -1,66 +1,202 @@ 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-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 idNr; +var dateien = new Array(); +var sendet = false; + +function fm_init_uploader() { + var dropzone = document.getElementById("dateien"); + dropzone.ondragover = dropzone.ondragenter = function(event) { + event.stopPropagation(); + event.preventDefault(); + }; + + 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(); + }; +} + +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 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); + } + }; + fd.append('dateiauswahlfeld', datei.file); + // Initiate a multipart/form-data upload + xhr.send(fd); +} + +function Datei (n, d) { + this.nr = n; + this.file = d; +} + +/* ----- Uploader Ende --------------- */ + +function fm_menu_test() { + var w = $('.ost').width(); + console.log('.ost.width: ' + w); + if(w == 0) { + $('.ost').width('20%'); + $('.ost').text('Hallo Welt!'); + } else { + $('.ost').empty(); + $('.ost').width(0); + } +} + +function fm_ansicht_umschalten() { + if($('#ansicht').children(0).hasClass('fa-th-list')) { + $('#ansicht').children(0).addClass('fa-th-large'); + $('#ansicht').children(0).removeClass('fa-th-list'); + modus = 'liste'; + } else { + $('#ansicht').children(0).addClass('fa-th-list'); + $('#ansicht').children(0).removeClass('fa-th-large'); + modus = 'kacheln'; + } + fm_get_list(pfad); +} + +function fm_set_modus() { + if(modus == 'kacheln') { + $('#ansicht').children(0).addClass('fa-th-list'); + $('#ansicht').children(0).removeClass('fa-th-large'); + } else { + $('#ansicht').children(0).addClass('fa-th-large'); + $('#ansicht').children(0).removeClass('fa-th-list'); + } } 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() { var elem = this; - //console.log('datei gewaehlt ' + $(elem).text().trim()); - if($(elem).children(0).hasClass('fa-folder')) { - var ordner = $(elem).text().trim(); - if(pfad.length > 0) { - pfad = pfad + '/' + ordner; + if(modus == 'kacheln') { + if($(elem).children(0).hasClass('fa-folder')) { + var ordner = $(elem).text().trim(); + if(pfad.length > 0) { + pfad = pfad + '/' + ordner; + } else { + pfad = ordner; + } + fm_get_list(pfad); + } else if($(elem).children(0).hasClass('fa-file')) { + $('.datei-gewaehlt').removeClass('datei-gewaehlt'); + $(elem).children(0).addClass('datei-gewaehlt'); } else { - pfad = ordner; + //console.log('kein folder oder file...'); } - fm_get_list(pfad); - } else if($(elem).children(0).hasClass('fa-file')) { - $('.datei-gewaehlt').removeClass('datei-gewaehlt'); - $(elem).children(0).addClass('datei-gewaehlt'); } else { - //console.log('kein folder oder file...'); + if($(elem).find('.datei-elem').children(0).hasClass('fa-file-o')) { + $('.table-info').removeClass('table-info'); + $(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; + } else { + pfad = ordner; + } + fm_get_list(pfad); + } } -} - -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); @@ -68,13 +204,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); @@ -96,16 +230,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?"); @@ -118,30 +244,43 @@ } function fm_get_file_content() { - var fname = $('.datei-gewaehlt').text(); - - //console.log(pfad + '/' + fname); - + 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_render_list(fl) { + if(modus == 'kacheln') { + // Kachelansicht + var template = $('#tpl-kacheln').html(); + Mustache.parse(template); // optional, speeds up future uses + $('.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 + $('.figure').attr('onclick','').unbind('click'); + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.datei-zeile').click(fm_dateiwahl); + } +} + // 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) { @@ -152,16 +291,12 @@ files.push(new FileRef(resp.List[0].FileRef)); } var fl = new FileList(files); - var template = $('#tpl-kacheln').html(); - Mustache.parse(template); // optional, speeds up future uses - $('.figure').attr('onclick','').unbind('click'); - $('#dateien').empty(); - $('#dateien').html(Mustache.render(template, fl)); - $('.figure').click(fm_dateiwahl); + fm_render_list(fl); } else { $('#dateien').empty(); } + // Breadcrumb-Ansicht var template; $('.breadcrumb-item').attr('onclick','').unbind('click'); $('#bcnav').empty(); @@ -205,22 +340,45 @@ pfad = ''; template = $('#tpl-bcr2').html(); Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').append(Mustache.render(template, dirList[0])); + $('#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() { + //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?"); @@ -236,21 +394,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() { @@ -267,10 +410,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", @@ -338,10 +477,18 @@ this.fr = obj; this.typeClass = function() { - if(self.fr.isDirectory) { - return 'fa-folder'; + if(modus == 'kacheln') { + if(self.fr.isDirectory) { + return 'fa-folder'; + } else { + return 'fa-file'; + } } else { - return 'fa-file'; + if(self.fr.isDirectory) { + return 'fa-folder'; + } else { + return 'fa-file-o'; + } } }; @@ -363,3 +510,4 @@ this.relPath = rp; this.fName = n; } + -- Gitblit v1.9.3