From 0ac2623eb41c24c65f294ee610b66ac6af7d18dd Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 13 Mar 2017 16:39:30 +0000 Subject: [PATCH] Compile-Versuch (erfolgreich) --- web/ui/ui.js | 216 ++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 192 insertions(+), 24 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 19bbd95..3b7f34b 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -24,9 +24,13 @@ var openEditor; var userid; var tmo; +var tmo2; var cutCopySrcDir; var cutCopyFiles; var cutCopyOperation; +var loc; +var PERS_DIR = "Persoenlich"; +var PUB_DIR = "Oeffentlich"; function fm_init() { $("#mce-editor").hide(); @@ -51,7 +55,9 @@ $('#m-cut').on('click', fm_menu_cut); $('#m-copy').on('click', fm_menu_copy); $('#m-paste').on('click', fm_menu_paste); + $('#m-shrink').on('click', fm_menu_shrink); $('#m-test').on('click', fm_menu_test); + $('#m-test-2').on('click', fm_menu_test_2); $('#saveModal').on('hidden.bs.modal', function (e) { $('#modal_ok').attr('onclick','').unbind('click'); }); @@ -59,6 +65,14 @@ fm_get_login(); fm_get_list(''); fm_init_uploader(); + /* + console.log('href: ' + window.location.href); + console.log('host: ' + window.location.host); + console.log('hostname: ' + window.location.hostname); + console.log('port: ' + window.location.port); + console.log('protocol: ' + window.location.protocol); + */ + loc = window.location.protocol + '//' + window.location.host; } function fm_resize_editor() { @@ -75,10 +89,10 @@ function fm_get_path(uid) { //console.log('pfad: ' + pfad); var restdir; - if(pfad.indexOf('Oeffentlich') > -1) { - restdir = pfad.substr('Oeffentlich'.length); - } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { - restdir = pfad.substr('Persoenlicher Ordner'.length); + if(pfad.indexOf(PUB_DIR) > -1) { + restdir = pfad.substr(PUB_DIR.length); + } else if(pfad.indexOf(PERS_DIR) > -1) { + restdir = pfad.substr(PERS_DIR.length); } if(restdir !== undefined && restdir.startsWith('/')) { restdir = restdir.substr(1); @@ -95,9 +109,9 @@ function fm_get_base(uid) { //console.log('pfad: ' + pfad); var pdir; - if(pfad.indexOf('Oeffentlich') > -1) { + if(pfad.indexOf(PUB_DIR) > -1) { pdir = '/data/'; - } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { + } else if(pfad.indexOf(PERS_DIR) > -1) { pdir = '/home/'; } //console.log('base: ' + pdir + uid); @@ -106,6 +120,7 @@ function fm_dok_editor_init(uid) { var base = fm_get_path(uid); + edCount = 0; //console.log("calling tinymce.init with base: " + base + "/"); /* @@ -124,11 +139,12 @@ * Konfiguration TinyMCE */ tinymce.init({ - content_css : "mce.css", + 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 print preview save table textcolor', + plugins: 'advlist charmap code image link lists media print preview save table textcolor importcss', toolbar: 'undo redo | styleselect | image | link unlink | bullist numlist | outdent indent | code', /* menu: { @@ -138,6 +154,7 @@ }, */ resize: 'both', + importcss_append: true, width: "100%", height: '100%', document_base_url : base + "/", @@ -208,8 +225,13 @@ } function fm_menu_delete() { $('#confirmOk').click(function() { + $('#confirmOk').attr('onclick','').unbind('click'); fm_del_files(); }); + $('#confirmOk').text("Loeschen"); + $('#confirmOk').removeClass('btn-primary'); + $('#confirmOk').addClass('btn-danger'); + $('#confirmClose').hide(); $('#confirmModalTitle').text("Löschen"); $('#confirmModalBody').text("Wirklich löschen?"); $('#confirmModal').modal({ @@ -255,6 +277,16 @@ } } +function fm_menu_test_2() { + var liste = fm_gewaehlte_dateien(); + var m = '?c=de.uhilger.filecms.api.CompileService&m=compile&p=' + pfad + '&p=' + encodeURIComponent(liste); + var u = '../svc' + m; + fm_get(u, "text", function(resp) { + console.log('compile gab folgendes zurueck: '); + console.log(resp); + }); +} + function fm_ansicht_umschalten() { if($('#ansicht').children(0).hasClass('fa-th-list')) { $('#ansicht').children(0).addClass('fa-th-large'); @@ -287,6 +319,49 @@ } function fm_menu_datei_schliessen() { + if(openEditor === 'text') { + if(!cm.getDoc().isClean()) { + fm_ask_for_save(); + } else { + fm_do_close(); + } + } else { + if(tinymce.activeEditor.undoManager.hasUndo()) { + fm_ask_for_save(); + } else { + fm_do_close(); + } + } +} + +function fm_ask_for_save() { + // hier Abfrage ob gespeichert werden soll + $('#confirmOk').click(function() { + $('#confirmOk').attr('onclick','').unbind('click'); + fm_menu_datei_speichern(function() { + fm_do_close(); + }); + }); + $('#confirmCancel').click(function() { + $('#confirmCancel').attr('onclick','').unbind('click'); + }); + $('#confirmClose').show(); + $('#confirmClose').click(function() { + $('#confirmClose').attr('onclick','').unbind('click'); + fm_do_close(); + }); + $('#confirmOk').text("Speichern"); + $('#confirmOk').addClass('btn-primary'); + $('#confirmOk').removeClass('btn-danger'); + $('#confirmModalTitle').text("Schliessen"); + $('#confirmModalBody').text("Speichern vor dem Schliessen?"); + $('#confirmModal').modal({ + keyboard: false, + show: true + }); +} + +function fm_do_close() { $('.codeeditor-space').hide(); $('.code-editor-container').hide(); $("#mce-editor").hide(); @@ -316,7 +391,7 @@ } fm_get_list(pfad); } - } else if($(elem).children(0).hasClass('fa-file')) { + } else if($(elem).children(0).hasClass('datei')) { if(/*ev.shiftKey || */ ev.ctrlKey) { // mehrere Dateien sollen gewaehlt werden } else { @@ -379,18 +454,27 @@ fm_filectls_hide(); fm_dok_editor_init(userid); $("#mce-editor").show(); - ed.setContent(content); - openEditor = 'dok'; + + window.clearTimeout(tmo2); + tmo2 = window.setTimeout(function () { + try { + ed.setContent(content); + openEditor = 'dok'; + } catch (err) { + } + }, 200); } function fm_filectls_hide() { $('#zentrum_bc').hide(); $('#dateien').hide(); + $('#editMenu').addClass('disabled'); } function fm_filectls_show() { $('#zentrum_bc').show(); $('#dateien').show(); + $('#editMenu').removeClass('disabled'); } /* ----- API Calls ------------- */ @@ -400,7 +484,6 @@ fm_get(u, "text", function(resp) { userid = resp; $('#userMenu').text(resp); - //fm_dok_editor_init(resp); }); } @@ -488,6 +571,18 @@ m = m + '&p=' + p; m = m + '&p=' + fn; m = m + '&p=' + neuerName; + var u = '../svc' + m; + fm_get(u, "text", function(resp) { + fm_get_list(pfad); + }); +} + +function fm_menu_shrink() { + var gewaehlte = $('.datei-gewaehlt'); + var fname = $(gewaehlte[0]).text(); + var m = '?c=de.uhilger.filecms.api.FileMgr&m=bildVerkleinern'; + m = m + '&p=' + pfad; + m = m + '&p=' + fname; var u = '../svc' + m; fm_get(u, "text", function(resp) { fm_get_list(pfad); @@ -674,34 +769,43 @@ }); } -function fm_menu_datei_speichern() { +function fm_menu_datei_speichern(callback) { //var fname = $('.datei-gewaehlt').text(); var fname = openFileName; if(fname !== undefined && fname !== '') { - fm_save_file(fname); + fm_save_file(fname, 'saveTextFile', callback); } else { - fm_menu_datei_speichern_unter(); + fm_menu_datei_speichern_unter(callback); } } -function fm_save_file(saveFileName) { +function fm_save_file(saveFileName, method, callback) { var content; if(openEditor === 'text') { content = cm.getValue(); + cm.getDoc().markClean(); } else { content = ed.getContent(); + tinymce.activeEditor.undoManager.clear(); } - var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile'; + var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method; var u = '../svc' + m; fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) { - openFileName = saveFileName; + // hier scheint nichts zurueckzukommen.. }); + openFileName = saveFileName; + if(typeof (callback) !== 'function') { + + } else { + callback(); + } } -function fm_menu_datei_speichern_unter() { +function fm_menu_datei_speichern_unter(callback) { $('#modal_ok').click(function() { + $('#modal_ok').attr('onclick','').unbind('click'); // hier speichern - fm_save_file($('#dateiname').val()); + fm_save_file($('#dateiname').val(), 'saveTextFileAs', callback); }); $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); @@ -732,6 +836,10 @@ /* ---- codemirror editor handling -------- */ +function htmlDecode(value){ + return $('<div/>').html(value).text(); +} + function fm_code_edit(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { lineNumbers: true, @@ -746,7 +854,10 @@ } } }); - cm.setValue(content); + //cm.setValue(htmlDecode(content)); + //cm.setValue(content); + cm.setValue(unescapeHtml(content)); + cm.getDoc().markClean(); } @@ -789,6 +900,31 @@ return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}'; } +function escapeHtml(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; +} + +function unescapeHtml(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; +} + + /* ----- Objekte ----- */ function FileList(fl) { @@ -798,6 +934,7 @@ function FileRef(obj) { var self = this; this.fr = obj; + this.fnx; this.typeClass = function() { if(modus == 'kacheln') { @@ -815,13 +952,44 @@ } }; - this.fileName = function() { + this.mini = function() { + var miniatur = false; var namen = self.fr.absolutePath.split('/'); if(namen.length > 0) { - return namen[namen.length - 1]; + self.fnx = decodeURIComponent(namen[namen.length - 1]); } else { - return self.fr.absolutePath; + self.fnx = decodeURIComponent(self.fr.absolutePath); } + if(self.fnx.indexOf('.jpg') > -1 || self.fnx.indexOf('.png') > -1 || self.fnx.indexOf('.gif') > -1 || self.fnx.indexOf('.jpeg') > -1) { + miniatur = true; + } + return miniatur; + }; + + this.miniurl = function() { + var userid = $('#userMenu').text(); + var ext = ''; + var dotpos = self.fnx.indexOf('.'); + if(dotpos > -1) { + var fny = self.fnx; + self.fnx = self.fnx.substring(0, dotpos); + ext = fny.substr(dotpos); + } + var path = fm_get_path(userid); + var imgurl = loc + path + '/' + self.fnx + '_tn' + ext; + return imgurl; + + }; + + this.fileName = function() { + + var namen = self.fr.absolutePath.split('/'); + if(namen.length > 0) { + return decodeURIComponent(namen[namen.length - 1]); + } else { + return decodeURIComponent(self.fr.absolutePath); + } + }; } -- Gitblit v1.9.3