From ebc1f371409171987dee6a782145189e25cc4d56 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Thu, 14 Jan 2021 20:24:13 +0000
Subject: [PATCH] Text bearbeiten und speichern noch in arbeit
---
web/ui2/js/app.js | 503 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 445 insertions(+), 58 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 4627bed..44685f2 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -7,21 +7,37 @@
this.pfad = '';
this.loc;
this.modus = 'kacheln';
+ this.cm;
+ this.tinymce;
this.PERS_DIR = "Persoenlich";
this.PUB_DIR = "Oeffentlich";
this.DAV_DIR = "Austausch";
this.BASE_DIR = "$basis";
this.DATA_DIR = "$daten";
this.WWW_DIR = "www";
+ this.openEditor;
+ this.openFileName;
this.cache = {}; // mustache template cache
this.datei_neuer_text = function () {
- self.meldung_mit_timeout("Neuer Text", 1500);
+ //self.meldung_mit_timeout("Neuer Text", 1500);
+ self.fm_text_edit('Neue Datei');
+ };
+
+ this.datei_neuer_ordner = function() {
+
};
/* Funktionen aus App-Vorlage */
this.init = function () {
+
+ // Hide and show an element by changing "display" to block and none
+ document.querySelector(".codeeditor-space").style.display = "none";
+ document.querySelector(".code-editor-container").style.display = "none";
+ document.querySelector("#mce-editor").style.display = "none";
+ //document.querySelector(".box").style.display = "block";
+
//self.vorlagen = new Vorlagen();
self.appMenu = new AppMenu();
self.appMenu.init(
@@ -44,6 +60,8 @@
} else {
self.fm_get_list('');
}
+
+ self.seitenleiste_umschalten();
//fm_init_uploader();
self.loc = window.location.protocol + '//' + window.location.host;
@@ -75,7 +93,7 @@
ostDiv.classList.add('ost-open');
ostDiv.style.flexBasis = '6em';
}
- self.menue_umschalten();
+ //self.menue_umschalten();
};
this.fusszeile_umschalten = function () {
@@ -104,6 +122,79 @@
}, 500);
}, timeout);
};
+
+ this.fm_menu_datei_schliessen = function() {
+ if(self.openEditor === 'text') {
+ if(!self.cm.getDoc().isClean()) {
+ self.fm_ask_for_save();
+ } else {
+ self.fm_do_close();
+ }
+ } else {
+ if(self.tinymce.activeEditor.undoManager.hasUndo()) {
+ self.fm_ask_for_save();
+ } else {
+ self.fm_do_close();
+ }
+ }
+ };
+
+ this.fm_ask_for_save = function() {
+ self.dialog_laden_und_zeigen('data/tpl/dlg-ask-save.tpl', '', function() {
+ // wenn dialog da ist, hier events verknuepfen
+ document.querySelector('#cancel-btn').addEventListener('click', function() {
+ self.fm_do_close();
+ self.dialog_schliessen();
+ });
+ document.querySelector('#speichern-btn').addEventListener('click', function() {
+ self.fm_menu_datei_speichern(function() {
+ self.fm_do_close();
+ self.dialog_schliessen();
+ });
+ });
+ });
+ };
+
+ this.fm_menu_datei_speichern = function(callback) {
+ //var fname = $('.datei-gewaehlt').text();
+ var fname = self.openFileName;
+ if(fname !== undefined && fname !== '') {
+ self.fm_save_file(fname, 'saveTextFile', callback);
+ } else {
+ self.fm_menu_datei_speichern_unter(callback);
+ }
+ };
+
+ this.fm_menu_datei_speichern_unter = function(callback) {
+ self.dialog_laden_und_zeigen('data/tpl/dlg-save-as.tpl', '', function() {
+
+ });
+
+
+ /*
+ $('#modal_ok').click(function() {
+ $('#modal_ok').attr('onclick','').unbind('click');
+ // hier speichern
+ fm_save_file($('#dateiname').val(), 'saveTextFileAs', callback);
+ });
+ $('#saveModalTitle').text('Datei speichern');
+ $('#dialogfrage').text("Dateiname?");
+
+ var fname = $('.datei-gewaehlt').text();
+ if(fname !== undefined) {
+ $('#dateiname').val(fname);
+ } else {
+ $('#dateiname').val('');
+ }
+ $('#dateiname').attr('placeholder', 'Dateiname');
+ $('#saveModal').modal({
+ keyboard: false,
+ show: true
+ });
+ */
+ };
+
+
/* Dialog-Funktionen */
@@ -113,23 +204,22 @@
vurl - URL zur Dialogvorlage
msgTpl - URL mit einer Vorlage eines Mitteilungstextes (optional)
*/
- this.dialog_laden_und_zeigen = function (vurl, msgTpl) {
- if (msgTpl !== '') {
- fetch(msgTpl)
- .then(data => {
- // Handle data
- self.dialog_zeigen(vurl, data);
- }).catch(error => {
- // Handle error
+ this.dialog_laden_und_zeigen = function (vurl, msgTpl, cb) {
+ var vorlage = self.cache[vurl];
+ if(vorlage === undefined) {
+ self.fm_get(vurl, "text", function(antwort) {
+ self.cache[vurl] = antwort;
+ self.dialog_zeigen(vurl, antwort, cb);
+ //self.vorlage_fuellen(vurl, inhalt, cb);
});
} else {
- self.dialog_zeigen(vurl, '');
+ self.dialog_zeigen(vurl, vorlage, cb);
}
};
- this.dialog_zeigen = function (vurl, inhalt) {
+ this.dialog_zeigen = function (vurl, inhalt, cb) {
var dlg = document.querySelector(".dialog");
- self.vorlagen.html_erzeugen(
+ self.html_erzeugen(
vurl,
inhalt,
function (html) {
@@ -138,6 +228,11 @@
dlg.innerHTML = html;
document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
//dlg.slideDown(300);
+ if(typeof(cb) !== 'function') {
+ // ..
+ } else {
+ cb();
+ }
});
};
@@ -152,19 +247,14 @@
this.fm_dateiwahl = function(ev) {
var elem = ev.target;
- //console.log(elem.nodeName);
- //var elem = this;
- //console.log('dateiwahl nach click, event shift: ' + ev.shiftKey + ", event ctrl: " + ev.ctrlKey);
if(self.modus == 'kacheln') {
// Kacheln
if(elem.classList.contains("icon-folder")) {
- //console.log('contains icon-folder');
if(/*ev.shiftKey || */ ev.ctrlKey) {
- //$(elem).find('.dateiname').addClass('datei-gewaehlt');
- elem.querySelector('.dateiname').classList.add('datei-gewaehlt');
+ var par = elem.parentElement;
+ par.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
var ordner = elem.parentElement.querySelector('.dateiname').textContent.trim();
- //console.log('ordner ' + ordner);
if(self.pfad.length > 0) {
self.pfad = self.pfad + '/' + ordner;
} else {
@@ -173,7 +263,6 @@
self.fm_get_list(self.pfad);
}
} else if(elem.classList.contains('datei')) {
- //console.log('contains datei');
if(/*ev.shiftKey || */ ev.ctrlKey) {
// mehrere Dateien sollen gewaehlt werden
} else {
@@ -182,37 +271,44 @@
gew.classList.remove('datei-gewaehlt');
}
}
- //$(elem).find('.dateiname').addClass('datei-gewaehlt');
var par = elem.parentElement;
- //console.log(par.nodeName);
par.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
//console.log('kein folder oder file...');
}
} else {
- // Liste NOCH NEU MACHEN OHNE jQuery, wenn Liste implementiert ist
- if(elem.querySelector('.datei-elem').children(0).hasClass('icon-doc-text-inv')) {
+ // Liste
+ var pElem = elem.closest('.datei-zeile');
+ var dElem = pElem.querySelector('.datei-elem');
+ if(dElem.getElementsByTagName("i")[0].classList.contains('icon-doc-text-inv')) {
// Datei
if(/*ev.shiftKey || */ ev.ctrlKey) {
// mehrere Dateien sollen gewaehlt werden
} else {
- document.querySelector('.table-info').classList.remove('table-info');
- document.querySelector('.datei-gewaehlt').classList.remove('datei-gewaehlt');
+ var ti = document.querySelector('.table-info');
+ if(ti !== null) {
+ ti.classList.remove('table-info');
+ }
+ var dg = document.querySelector('.datei-gewaehlt');
+ if(dg !== null) {
+ dg.classList.remove('datei-gewaehlt');
+ }
}
- elem.classList.add('table-info');
- elem.querySelector('.dateiname').classList.add('datei-gewaehlt');
+ pElem.classList.add('table-info');
+ pElem.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
// Ordner
if(/*ev.shiftKey || */ ev.ctrlKey) {
- elem.children[0].classList.add('datei-gewaehlt');
+ //elem.children[0].classList.add('datei-gewaehlt');
+ pElem.querySelector('.dateiname').classList.add('datei-gewaehlt');
} else {
- var ordner = elem.querySelector('.dateiname').textContent;
+ var ordner = pElem.querySelector('.dateiname').textContent;
if(self.pfad.length > 0) {
self.pfad = self.pfad + '/' + ordner;
} else {
self.pfad = ordner;
}
- self.fm_get_list(pfad);
+ self.fm_get_list(self.pfad);
}
}
}
@@ -220,7 +316,7 @@
this.fm_render_list = function (fl) {
- if (self.modus == 'kacheln') {
+ if (self.modus === 'kacheln') {
// Kachelansicht
self.html_erzeugen("data/tpl/kacheln.tpl", fl, function(html) {
var elem = document.querySelector('#dateien');
@@ -229,22 +325,15 @@
});
} else {
// Listenansicht
-
- // neu bauen
-
- /*
- 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);
- */
+ self.html_erzeugen("data/tpl/liste.tpl", fl, function(html) {
+ var elem = document.querySelector('#dateien');
+ elem.innerHTML = html;
+ self.addEvtListener('.datei-zeile', 'click', self.fm_dateiwahl);
+ });
}
};
this.fm_get_path = function (uid) {
- //console.log('pfad: ' + pfad);
var restdir;
if (self.pfad.indexOf(self.PUB_DIR) > -1) {
restdir = self.pfad.substr(self.PUB_DIR.length);
@@ -264,7 +353,6 @@
}
}
var pdir = self.fm_get_base(uid);
- // console.log('fm_get_path path: ' + pdir + "/" + restdir);
if (restdir.length > 1) {
return pdir + "/" + restdir;
} else {
@@ -273,7 +361,6 @@
};
this.fm_get_base = function (uid) {
- //console.log('pfad: ' + pfad);
var pdir;
if (self.pfad.indexOf(self.PUB_DIR) > -1) {
pdir = '/data/' + uid;
@@ -284,7 +371,6 @@
} else if (self.pfad.indexOf(self.DATA_DIR) > -1) {
pdir = '';
}
- //console.log('fm_get_base base: ' + pdir + uid);
return pdir;
};
@@ -316,6 +402,39 @@
return dirList;
};
+ /*
+ * icon-th-large
+ * icon-th-list
+ * @returns {undefined}
+ */
+ this.fm_ansicht_umschalten = function() {
+ var elem = document.querySelector('#ansicht');
+ var iElem = elem.getElementsByTagName("i")[0];
+ if(iElem.classList.contains('icon-th-list')) {
+ iElem.classList.add('icon-th-large');
+ iElem.classList.remove('icon-th-list');
+ self.modus = 'liste';
+ } else {
+ iElem.classList.add('icon-th-list');
+ iElem.classList.remove('icon-th-large');
+ self.modus = 'kacheln';
+ }
+ self.fm_get_list(self.pfad);
+ };
+
+ this.fm_set_modus = function() {
+ var elem = document.querySelector('#ansicht');
+ var iElem = elem.getElementsByTagName("i")[0];
+ if(self.modus === 'kacheln') {
+ iElem.classList.add('icon-th-list');
+ iElem.classList.remove('icon-th-large');
+ } else {
+ iElem.classList.add('icon-th-large');
+ iElem.classList.remove('icon-th-list');
+ }
+ };
+
+
/**
* Der letzte Eintrag in dirs ist der aktuelle Ordner und
* deshalb ausgegraut.
@@ -331,18 +450,34 @@
if(dirList.length > 1) {
var last = dirList.pop();
var bcList = new BcrFiles(dirList);
+
self.html_erzeugen("data/tpl/bcr.tpl", bcList, function(html) {
- elem.innerHTML = html;
+ var htmlGesamt = html;
self.html_erzeugen("data/tpl/bcr2.tpl", last, function(html) {
- elem.innerHTML += html;
- self.addEvtListener('.bc-link', 'click', self.fm_bc_click);
+ htmlGesamt += html;
+ self.html_erzeugen("data/tpl/bcr3.tpl", dirList[0], function(html) {
+ htmlGesamt += html;
+ elem.innerHTML = htmlGesamt;
+ self.addEvtListener('.bc-link', 'click', self.fm_bc_click);
+ self.addEvtListener('#ansicht', 'click', self.fm_ansicht_umschalten);
+ self.fm_set_modus();
+ });
+
});
});
} else {
// oberste Ebene
+ var htmla;
+ var htmlb;
self.html_erzeugen("data/tpl/bcr2.tpl", dirList[0], function(html) {
- elem.innerHTML = html;
- self.addEvtListener('.bc-link', 'click', self.fm_bc_click);
+ htmla = html;
+ self.html_erzeugen("data/tpl/bcr3.tpl", dirList[0], function(html) {
+ htmlb = html;
+ elem.innerHTML = htmla + htmlb;
+ self.addEvtListener('.bc-link', 'click', self.fm_bc_click);
+ self.addEvtListener('#ansicht', 'click', self.fm_ansicht_umschalten);
+ self.fm_set_modus();
+ });
});
}
};
@@ -364,13 +499,10 @@
}
};
-
-
/* API functions */
// http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p=
this.fm_get_list = function (relPfad) {
- //$('#ansicht').attr('onclick', '').unbind('click');
var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad;
var u = '../svc' + m;
self.fm_get(u, "json", function (respText) {
@@ -386,7 +518,6 @@
}
var fl = new FileList(files);
self.fm_render_list(fl);
- //self.fm_render_list(resp);
} else {
// #dateien leeren
var elem = document.querySelector("#dateien");
@@ -396,8 +527,183 @@
// Breadcrumb
var dirList = self.fm_buildBreadcrumb(relPfad);
- self.fm_renderBreadcrumb(dirList);
+ self.fm_renderBreadcrumb(dirList);
});
+ };
+
+ this.fm_edit_as_text = function() {
+ self.fm_get_file_content('text');
+ };
+
+ this.fm_get_file_content = function(typ) {
+ var gewaehlte = document.querySelector('.datei-gewaehlt');
+ //var fname = $(gewaehlte).find('.dateiname').text();
+
+ var fname = gewaehlte.textContent;
+ //console.log('fname: ' + fname);
+ self.openFileName = fname;
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + self.pfad + '&p=' + fname;
+ var u = '../svc' + m;
+ self.fm_get(u, "text", function(resp) {
+ if(typ === 'text') {
+ var mode = "text/x-java";
+ if(fname.endsWith('js')) {
+ mode = 'javascript';
+ } else if(fname.endsWith('xml')) {
+ mode = 'xml';
+ } else if(fname.endsWith('properties')) {
+ mode = 'xml';
+ } else if(fname.endsWith('adoc')) {
+ mode = 'text/x-markdown';
+ }
+ self.fm_text_edit(resp, mode);
+ } else {
+ self.fm_dok_edit(resp);
+ }
+ });
+ };
+
+ this.fm_save_file = function(saveFileName, method, callback) {
+ var content;
+ if(self.openEditor === 'text') {
+ content = self.cm.getValue();
+ self.cm.getDoc().markClean();
+ } else {
+ content = ed.getContent();
+ tinymce.activeEditor.undoManager.clear();
+ }
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method;
+ var u = '../svc'; // + m;
+ //var data = [self.pfad, saveFileName, content];
+ //var data = "p=" + self.serialisieren(self.pfad);
+ //data += "&p=" + self.serialisieren(saveFileName);
+ //data += "&p=" + self.serialisieren(content);
+ var data = 'c=de.uhilger.filecms.api.FileMgr&m=' + method + '&p=' + self.pfad + '&p=' + saveFileName + 'p3=' + content;
+ self.http_post(u, data, function(resp) {
+ // hier scheint nichts zurueckzukommen..
+ });
+ /*
+ self.fm_post(u, {p: self.pfad, p: saveFileName, p: content}, '', function(resp) {
+ // hier scheint nichts zurueckzukommen..
+ });
+ */
+ self.openFileName = saveFileName;
+ if(typeof (callback) !== 'function') {
+
+ } else {
+ callback();
+ }
+ };
+
+
+
+/* ---- codemirror editor handling -------- */
+
+ /*
+ function htmlDecode(value){
+ return $('<div/>').html(value).text();
+ }
+ */
+
+ this.fm_code_edit = function(content, m) {
+ //console.log('fm_code_edit content: ' + content.substring(0,30));
+ self.cm = CodeMirror.fromTextArea(document.getElementById("editspace"), {
+ lineNumbers: true,
+ lineWrapping: true,
+ gutters: ["CodeMirror-linenumbers", "breakpoints"],
+ mode: m,
+ viewportMargin : Infinity,
+ tabSize: 2,
+ extraKeys: {
+ "F9": function(cm) {
+ cm.setOption("fullScreen", !cm.getOption("fullScreen"));
+ },
+ "Esc": function(cm) {
+ if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
+ },
+ ".": function(cm) {
+ console.log('dot pressed: perhaps look up class or method name');
+ /*
+ * Hier kann man eine Funktion ausloesen, die fuer das
+ * Wort vor dem Punkt (Name der Klasse) eine Liste mit
+ * Vorschlaegen fuer Methodennamen einblendet.
+ */
+
+ /*
+ * CodeMirror.Pass laesst das Zeichen zum Editorinhalt durch,
+ * verhindert aber das Ausloesen von 'keyHandled'
+ */
+ return CodeMirror.Pass;
+ }
+ }
+ });
+ //cm.setValue(htmlDecode(content));
+ //cm.setValue(content);
+ self.cm.setValue(self.unescapeHtml(content));
+ self.cm.getDoc().markClean();
+ self.cm.on("gutterClick", function(theEditor, lineNumber) {
+ var info = theEditor.lineInfo(lineNumber);
+ //--lineNumber;
+ //console.log(info.gutterMarkers.breakpoints.message);
+ //var marker = info.gutterMarkers.breakpoints;
+ //$(marker).tooltip('toggle');
+ });
+ /*
+ cm.on("keyHandled", function(theEditor, keyName, event){
+ console.log('cm.keyHandled keyName: ' + keyName + ', event.type: ' + event.type);
+ });
+ */
+ };
+
+ this.makeMarker = function(msg) {
+ var marker = document.createElement("div");
+ marker.style.color = "#822";
+ marker.innerHTML = "●";
+ //marker.message = msg;
+ $(marker).tooltip({
+ placement: 'right',
+ title: msg,
+ offset: '0 -30'
+ });
+ return marker;
+ };
+
+
+ /* -------- Editoren --------- */
+
+ this.fm_text_edit = function(content, mode) {
+ document.querySelector(".codeeditor-space").style.display = "block";
+ document.querySelector(".code-editor-container").style.display = "block";
+ document.querySelector(".zentrum-behaelter").style.display = "none";
+ self.fm_code_edit(content, mode);
+ self.openEditor = 'text';
+ };
+
+ this.fm_dok_edit = function(content) {
+ //fm_filectls_hide();
+ fm_dok_editor_init(userid);
+ $("#mce-editor").show();
+
+ window.clearTimeout(tmo2);
+ tmo2 = window.setTimeout(function () {
+ try {
+ ed.setContent(content);
+ openEditor = 'dok';
+ } catch (err) {
+ }
+ }, 200);
+ };
+
+ this.fm_do_close = function() {
+ document.querySelector(".codeeditor-space").style.display = "none";
+ document.querySelector(".code-editor-container").style.display = "none";
+ document.querySelector(".zentrum-behaelter").style.display = "block";
+ if(self.cm !== undefined) {
+ self.cm.toTextArea();
+ }
+ self.openFileName = '';
+ self.openEditor = '';
+ self.fm_get_list(self.pfad);
};
/* -------- An- und Abmelden ------------- */
@@ -437,6 +743,30 @@
el.parentNode.replaceChild(elClone, el);
}; // https://stackoverflow.com/questions/19469881/remove-all-event-listeners-of-specific-type
+ this.escapeHtml = function(text) {
+ text = text.replace(/\u228/g,'ä');
+ text = text.replace(/\u246/g,'ö');
+ text = text.replace(/\u252/g,'ü');
+ text = text.replace(/\u196/g,'Ä');
+ text = text.replace(/\u214/g,'Ö');
+ text = text.replace(/\u220/g,'Ü');
+ text = text.replace(/\u223/g,'ß');
+ text = text.replace(/\u26/g,'&');
+ return text;
+ };
+
+ this.unescapeHtml = function(text) {
+ text = text.replace(/ä/g, String.fromCharCode(228));
+ text = text.replace(/ö/g, String.fromCharCode(246));
+ text = text.replace(/ü/g, String.fromCharCode(252));
+ text = text.replace(/Ä/g, String.fromCharCode(196));
+ text = text.replace(/Ö/g, String.fromCharCode(214));
+ text = text.replace(/Ü/g, String.fromCharCode(220));
+ text = text.replace(/ß/g, String.fromCharCode(223));
+ text = text.replace(/&/g, String.fromCharCode(26));
+ return text;
+ };
+
/* ---- Vorlagen ---- */
this.html_erzeugen = function(vurl, inhalt, cb) {
@@ -472,5 +802,62 @@
xmlhttp.open("GET", url, true);
xmlhttp.send();
};
+
+ self.fm_post = function(u, d, dtype, scallback) {
+ var xmlhttp = new XMLHttpRequest();
+ var url = u;
+ xmlhttp.onreadystatechange = function() {
+ if (this.readyState == 4 && this.status == 200) {
+ scallback(this.responseText);
+ }
+ };
+ xmlhttp.open("POST", url, true);
+ xmlhttp.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+ //xmlhttp.send(d);
+ xmlhttp.send(self.serialisieren(d));
+
+ /*
+ $.ajax({
+ url: u,
+ data: d,
+ type: "POST",
+ dataType: dtype,
+ success: scallback,
+ error: function (xhr, status, errorThrown) {
+ $('#fehler').html("Error: " + errorThrown + " Status: " + status);
+ },
+ complete: function (xhr, status) {
+ //alert( "The request is complete!" );
+ }
+ });
+ */
+ };
+
+ this.http_get = function(u, cb) {
+ self.http_call('GET', u, null, cb);
+ };
+
+ this.http_post = function(u, data, cb) {
+ self.http_call('POST', u, data, cb);
+ };
+
+ this.http_call = function (method, u, data, scallback) {
+ var xhr = new XMLHttpRequest();
+ var url = u;
+ xhr.onreadystatechange = function() {
+ if (this.readyState === 4 && this.status === 200) {
+ scallback(this.responseText);
+ }
+ };
+ xhr.open(method, url);
+ if(method === 'GET') {
+ xhr.send();
+ } else if(method === 'POST' || method === 'PUT') {
+ xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
+ xhr.send(data);
+ }
+ };
+
+
}
--
Gitblit v1.9.3