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 | 144 ++++++++++++++++++++++++++++------------------- 1 files changed, 86 insertions(+), 58 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 4d69657..3b7f34b 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -29,6 +29,8 @@ var cutCopyFiles; var cutCopyOperation; var loc; +var PERS_DIR = "Persoenlich"; +var PUB_DIR = "Oeffentlich"; function fm_init() { $("#mce-editor").hide(); @@ -55,6 +57,7 @@ $('#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'); }); @@ -86,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); @@ -106,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); @@ -117,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 + "/"); /* @@ -136,6 +140,7 @@ */ 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, @@ -220,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({ @@ -267,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'); @@ -299,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(); @@ -421,7 +484,6 @@ fm_get(u, "text", function(resp) { userid = resp; $('#userMenu').text(resp); - //fm_dok_editor_init(resp); }); } @@ -707,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, 'saveTextFile'); + fm_save_file(fname, 'saveTextFile', callback); } else { - fm_menu_datei_speichern_unter(); + fm_menu_datei_speichern_unter(callback); } } -function fm_save_file(saveFileName, method) { +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=' + 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(), 'saveTextFileAs'); + fm_save_file($('#dateiname').val(), 'saveTextFileAs', callback); }); $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); @@ -786,6 +857,7 @@ //cm.setValue(htmlDecode(content)); //cm.setValue(content); cm.setValue(unescapeHtml(content)); + cm.getDoc().markClean(); } @@ -908,50 +980,6 @@ return imgurl; }; - - /* - this.kachel = function() { - var htm; - var fnx; // = self.fileName; - var namen = self.fr.absolutePath.split('/'); - if(namen.length > 0) { - fnx = decodeURIComponent(namen[namen.length - 1]); - } else { - fnx = decodeURIComponent(self.fr.absolutePath); - } - - - if(fnx.indexOf('.jpg') > -1 || fnx.indexOf('.png') > -1 || fnx.indexOf('.gif') > -1 || fnx.indexOf('.jpeg') > -1) { - var userid = $('#userMenu').text(); - var ext = ''; - var dotpos = fnx.indexOf('.'); - if(dotpos > -1) { - fnx = fnx.substring(0, dotpos); - ext = fnx.substr(dotpos); - } - var path = fm_get_path(userid); - var imgurl = path + '/' + fnx + '_tn' + ext; - htm = "img src='" + imgurl + "'"; - } else { - var cl; - if(modus == 'kacheln') { - if(self.fr.isDirectory) { - cl = 'fa-folder ordner'; - } else { - cl = 'fa-file datei'; - } - } else { - if(self.fr.isDirectory) { - cl = 'fa-folder ordner'; - } else { - cl = 'fa-file-o datei'; - } - } - htm = "i class='fa " + cl + " fa-3x'></i"; - } - return htm; - }; - */ this.fileName = function() { -- Gitblit v1.9.3