From af343d346e4e22ebffb3f515b90ed117b6016923 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Thu, 23 Feb 2017 22:47:59 +0000
Subject: [PATCH] sendFile aufgeraeumt

---
 web/ui/ui.js |  122 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 114 insertions(+), 8 deletions(-)

diff --git a/web/ui/ui.js b/web/ui/ui.js
index 6f17dea..fba829b 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -1,21 +1,106 @@
 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) {
+  // 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) {  
+      sendet = false;
+      fm_get_list(pfad);
+      naechsteDatei();
+    }  
+  };  
+  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() {
@@ -42,7 +127,7 @@
 }
 
 function fm_menu_neue_textdatei() {
-  fm_text_edit('Test');
+  fm_text_edit('Neue Datei');
 }
 
 function fm_menu_datei_schliessen() {
@@ -51,6 +136,8 @@
   cm.toTextArea();
   $('#bcnav').show();
   $('#dateien').show();
+  openFileName = '';
+  fm_get_list(pfad);
 }
 
 function fm_dateiwahl() {
@@ -86,10 +173,6 @@
       fm_get_list(pfad);
     }   
   }
-}
-
-function fm_menu_neuer_ordner() {
-  fm_get_new_folder();
 }
 
 function fm_bc_click() {
@@ -128,7 +211,7 @@
     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);
     });
   });
   $('.modal-title').text('Neuer Ordner');
@@ -143,6 +226,7 @@
 
 function fm_get_file_content() {
   var fname = $('.datei-gewaehlt').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) {
@@ -247,14 +331,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?");
@@ -385,4 +490,5 @@
 function BcrFile(rp, n) {
   this.relPath = rp;
   this.fName = n;
-}
\ No newline at end of file
+}
+

--
Gitblit v1.9.3