From b20b749a95f6aa9d73414c58b66b4c7abe9b1077 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sat, 16 Jan 2021 16:31:25 +0000
Subject: [PATCH] Stile angepasst, Neuer Reiter hinzugefuegt, Menue angepasst
---
web/ui2/js/app.js | 250 +++++++++++++++++++++++++++++++------------------
1 files changed, 158 insertions(+), 92 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 44685f2..3e08ec4 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -1,14 +1,17 @@
function AppVorlage() {
var self = this;
this.appMenu;
- this.vorlagen;
+ //this.vorlagen;
this.api;
this.userid;
this.pfad = '';
this.loc;
this.modus = 'kacheln';
this.cm;
- this.tinymce;
+ //this.tinymce;
+ this.ed;
+ this.tmo;
+ this.tmo2;
this.PERS_DIR = "Persoenlich";
this.PUB_DIR = "Oeffentlich";
this.DAV_DIR = "Austausch";
@@ -24,21 +27,11 @@
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
+ this.init = function () {
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(
"data/menu/",
@@ -64,13 +57,14 @@
self.seitenleiste_umschalten();
//fm_init_uploader();
self.loc = window.location.protocol + '//' + window.location.host;
-
- //self.fm_get_list('');
- //self.loc = window.location.protocol + '//' + window.location.host;
};
this.login_zeigen = function() {
self.meldung_mit_timeout("Benutzer: " + self.userid, 1500);
+ };
+
+ this.fm_neuer_reiter = function() {
+ window.open('/file-cms/ui2/?pfad=' + self.pfad, '_blank');
};
this.menue_umschalten = function () {
@@ -131,7 +125,7 @@
self.fm_do_close();
}
} else {
- if(self.tinymce.activeEditor.undoManager.hasUndo()) {
+ if(tinymce.activeEditor.undoManager.hasUndo()) {
self.fm_ask_for_save();
} else {
self.fm_do_close();
@@ -167,34 +161,26 @@
this.fm_menu_datei_speichern_unter = function(callback) {
self.dialog_laden_und_zeigen('data/tpl/dlg-save-as.tpl', '', function() {
-
+ 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() {
+ //console.log(document.querySelector('#datei-name-in').value);
+ self.fm_save_file(document.querySelector('#datei-name-in').value, 'saveTextFileAs', callback);
+ if(typeof(callback) !== 'function') {
+ self.fm_do_close();
+ self.dialog_schliessen();
+ }
+ //});
+ });
});
-
-
- /*
- $('#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
- });
- */
};
-
-
+
+ this.fm_menu_neues_dokument = function() {
+ self.fm_dok_edit('');
+ };
/* Dialog-Funktionen */
@@ -224,7 +210,7 @@
inhalt,
function (html) {
//dlg.html(html);
- dlg.style.height = '5em';
+ dlg.style.height = '7em';
dlg.innerHTML = html;
document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
//dlg.slideDown(300);
@@ -243,6 +229,8 @@
//dlg.style.display = "none";
dlg.style.height = '0';
dlg.innerHTML = '';
+ self.removeAllListeners('#cancel-btn');
+ self.removeAllListeners('#speichern-btn');
};
this.fm_dateiwahl = function(ev) {
@@ -531,8 +519,30 @@
});
};
+ this.datei_neuer_ordner = function() {
+ self.dialog_laden_und_zeigen('data/tpl/dlg-ask-folder.tpl', '', function() {
+ document.querySelector('#cancel-btn').addEventListener('click', function() {
+ self.dialog_schliessen();
+ });
+ document.querySelector('#speichern-btn').addEventListener('click', function() {
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=newFolder&p=' +
+ self.pfad +
+ '&p=' + document.querySelector('#folder-name-in').value;
+ var u = '../svc' + m;
+ self.fm_get(u, "json", function(resp) {
+ self.dialog_schliessen();
+ self.fm_get_list(self.pfad);
+ });
+ });
+ });
+ };
+
this.fm_edit_as_text = function() {
self.fm_get_file_content('text');
+ };
+
+ this.fm_edit_as_doc = function() {
+ self.fm_get_file_content('doc');
};
this.fm_get_file_content = function(typ) {
@@ -569,24 +579,15 @@
content = self.cm.getValue();
self.cm.getDoc().markClean();
} else {
- content = ed.getContent();
+ content = self.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..
+ var u = '../svc' + m;
+ var data = '&p=' + self.pfad + '&p=' + saveFileName + '&p=' + encodeURIComponent(content);
+ self.fm_post(u, data, "text", function(resp) {
+ // ...
});
- /*
- self.fm_post(u, {p: self.pfad, p: saveFileName, p: content}, '', function(resp) {
- // hier scheint nichts zurueckzukommen..
- });
- */
self.openFileName = saveFileName;
if(typeof (callback) !== 'function') {
@@ -668,27 +669,102 @@
return marker;
};
+ /* ---- TinyMCE editor handling -------- */
+
+ this.fm_dok_editor_init = function(uid) {
+ var base = self.fm_get_path(uid);
+ //var edCount = 0;
+ //console.log("fm_dok_editor_init calling tinymce.init with base: " + base + "/");
+
+ /*
+ * vgl.
+ * http://stackoverflow.com/questions/4651676/how-do-i-remove-tinymce-and-then-re-add-it
+ */
+ //tinymce.EditorManager.execCommand('mceRemoveControl',true, 'textarea.text-editor');
+ //tinymce.EditorManager.execCommand('mceAddControl',true, editor_id);
+ if(self.ed !== undefined) {
+ self.ed.destroy();
+ }
+ if(tinymce !== undefined) {
+ tinymce.remove('textarea.text-editor');
+ tinymce.EditorManager.editors = [];
+ }
+
+ /*
+ * Konfiguration TinyMCE
+ */
+ tinymce.init({
+ content_css : "/file-cms/ui/mce.css",
+ //content_css: "/jslib/bootstrap/css/bootstrap.min.css",
+ selector: "textarea.text-editor",
+ statusbar: false,
+ menubar: false,
+ plugins: 'advlist charmap code image link lists media table print preview save table textcolor importcss',
+ toolbar: 'undo redo | styleselect | image table | link unlink | bullist numlist | outdent indent | code',
+ /*
+ menu: {
+ file: {title: 'File', items: 'savevers | exit'},
+ edit: {title: 'Edit', items: 'undo redo | cut copy paste pastetext | selectall'},
+ view: {title: 'View', items: 'visualaid | code | link image media | template hr'},
+ },
+ */
+ resize: 'both',
+ importcss_append: true,
+ width: "100%",
+ height: '100%',
+ relative_urls : true,
+ convert_urls : false,
+ document_base_url : base + "/",
+ setup: function (editor) {
+ self.ed = editor;
+ }
+ });
+
+ window.addEventListener('resize', self.fm_resize_editor);
+ //$(window).on('resize', self.fm_resize_editor);
+ self.fm_resize_editor();
+ };
+
+ this.fm_resize_editor = function() {
+ window.clearTimeout(self.tmo);
+ self.tmo = window.setTimeout(function () {
+ try {
+ var myHeight = document.querySelector('.inhalt').offsetHeight -
+ document.querySelector('.nord').offsetHeight + 2; // - 4;
+ //console.log('myHeight: ' + myHeight);
+ self.ed.theme.resizeTo('100%', myHeight); // sets the dimensions of the editable area
+ } catch (err) {
+ }
+ }, 200);
+ };
+
+
/* -------- 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";
+ //document.querySelector(".code-editor-container").style.display = "block";
+ //document.querySelector(".zentrum-behaelter").style.display = "none";
+ document.querySelector(".breadcrumb").style.display = "none";
+ document.querySelector(".zentrum").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();
+ self.fm_dok_editor_init(self.userid);
+ document.querySelector("#mce-editor").style.display = "block";
+ //$("#mce-editor").show();
+ document.querySelector(".breadcrumb").style.display = "none";
+ document.querySelector(".zentrum").style.display = "none";
- window.clearTimeout(tmo2);
- tmo2 = window.setTimeout(function () {
+ window.clearTimeout(self.tmo2);
+ self.tmo2 = window.setTimeout(function () {
try {
- ed.setContent(content);
- openEditor = 'dok';
+ self.ed.setContent(content);
+ self.openEditor = 'dok';
} catch (err) {
}
}, 200);
@@ -696,8 +772,12 @@
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";
+ document.querySelector("#mce-editor").style.display = "none";
+ // $("#mce-editor").hide();
+ //document.querySelector(".code-editor-container").style.display = "none";
+ //document.querySelector(".zentrum-behaelter").style.display = "block";
+ document.querySelector(".breadcrumb").style.display = "block";
+ document.querySelector(".zentrum").style.display = "block";
if(self.cm !== undefined) {
self.cm.toTextArea();
}
@@ -739,8 +819,10 @@
this.removeAllListeners = function(id) {
var el = document.getElementById(id);
- elClone = el.cloneNode(true);
- el.parentNode.replaceChild(elClone, el);
+ if(el !== null) {
+ elClone = el.cloneNode(true);
+ el.parentNode.replaceChild(elClone, el);
+ }
}; // https://stackoverflow.com/questions/19469881/remove-all-event-listeners-of-specific-type
this.escapeHtml = function(text) {
@@ -795,7 +877,7 @@
var xmlhttp = new XMLHttpRequest();
var url = u;
xmlhttp.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200) {
+ if (this.readyState === 4 && this.status === 200) {
scallback(this.responseText);
}
};
@@ -807,32 +889,16 @@
var xmlhttp = new XMLHttpRequest();
var url = u;
xmlhttp.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200) {
+ 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!" );
- }
- });
- */
+ xmlhttp.send(d);
};
+ /*
this.http_get = function(u, cb) {
self.http_call('GET', u, null, cb);
};
@@ -849,7 +915,7 @@
scallback(this.responseText);
}
};
- xhr.open(method, url);
+ xhr.open(method, url, false);
if(method === 'GET') {
xhr.send();
} else if(method === 'POST' || method === 'PUT') {
@@ -857,7 +923,7 @@
xhr.send(data);
}
};
-
+ */
}
--
Gitblit v1.9.3