From e4fec9e56c5cc32b38dc471a57e8844d32ec0b4f Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Sat, 03 Mar 2018 09:59:19 +0000 Subject: [PATCH] Bildbetrachtung fuer oeffentliche Ordner hinzugefuegt --- web/ui/ui.js | 516 +++++++++++++++++--------------------------------------- 1 files changed, 158 insertions(+), 358 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 2cfd263..ca6a3f8 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -31,11 +31,17 @@ var loc; var PERS_DIR = "Persoenlich"; var PUB_DIR = "Oeffentlich"; +var BASE_DIR = "$basis"; +var DATA_DIR = "$daten"; +var WWW_DIR = "www"; +var compilerIssues; +var fm_slideshow = false; function fm_init() { $("#mce-editor").hide(); $('.codeeditor-space').hide(); $('.code-editor-container').hide(); + $('.sued').hide(); //$('.ost').attr('flex-basis', 0); $('#newTextFile').on('click', fm_menu_neue_textdatei); $('#newDoc').on('click', fm_menu_neues_dokument); @@ -51,17 +57,24 @@ $('#saveFileAs').on('click', fm_menu_datei_speichern_unter); $('#closeFile').on('click', fm_menu_datei_schliessen); $('#renameFile').on('click', fm_menu_datei_umbenennen); + $('#m-unzip').on('click', fm_menu_datei_entpacken); + $('#m-html-export').on('click', fm_menu_html_export); $('#m-del').on('click', fm_menu_delete); $('#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-toggle-slideshow').on('click', fm_toggle_show_slideshow); $('#m-test').on('click', fm_menu_test); - $('#m-test-2').on('click', fm_menu_test_2); + $('#m-test-2').on('click', fm_menu_compile); + $('#m-test-3').on('click', fm_menu_compile_all); + $('#m-compile-results').on('click', fm_fusszeile_zeigen); + $('#m-build-app').on('click', fm_menu_build_app); $('#saveModal').on('hidden.bs.modal', function (e) { $('#modal_ok').attr('onclick','').unbind('click'); }); $('#logout').click(fm_logout); + $('#fusszeile-schliessen').on('click', fm_fusszeile_schliessen); fm_get_login(); fm_get_list(''); fm_init_uploader(); @@ -75,6 +88,16 @@ loc = window.location.protocol + '//' + window.location.host; } +function fm_toggle_show_slideshow() { + if(fm_slideshow) { + $('#m-toggle-slideshow').text('Diashow nicht zeigen'); + fm_slideshow = false; + } else { + $('#m-toggle-slideshow').text('Diashow zeigen'); + fm_slideshow = true; + } +} + function fm_resize_editor() { window.clearTimeout(tmo); tmo = window.setTimeout(function () { @@ -86,6 +109,14 @@ }, 200); } +function fm_fusszeile_schliessen() { + $('.sued').hide(); +} + +function fm_fusszeile_zeigen() { + $('.sued').show(); +} + function fm_get_path(uid) { //console.log('pfad: ' + pfad); var restdir; @@ -93,12 +124,19 @@ restdir = pfad.substr(PUB_DIR.length); } else if(pfad.indexOf(PERS_DIR) > -1) { restdir = pfad.substr(PERS_DIR.length); + } else if(pfad.indexOf(BASE_DIR) > -1) { + restdir = pfad.substr(BASE_DIR.length); + } else if(pfad.indexOf(DATA_DIR) > -1) { + restdir = pfad.substr(DATA_DIR.length); } if(restdir !== undefined && restdir.startsWith('/')) { restdir = restdir.substr(1); + if(restdir.indexOf(WWW_DIR) > -1) { + restdir = restdir.replace(WWW_DIR, 'data'); + } } var pdir = fm_get_base(uid); - //console.log('path: ' + pdir + "/" + restdir); + // console.log('fm_get_path path: ' + pdir + "/" + restdir); if(restdir.length > 1) { return pdir + "/" + restdir; } else { @@ -110,18 +148,22 @@ //console.log('pfad: ' + pfad); var pdir; if(pfad.indexOf(PUB_DIR) > -1) { - pdir = '/data/'; + pdir = '/data/' + uid; } else if(pfad.indexOf(PERS_DIR) > -1) { - pdir = '/home/'; + pdir = '/home/' + uid; + } else if(pfad.indexOf(BASE_DIR) > -1) { + pdir = ''; + } else if(pfad.indexOf(DATA_DIR) > -1) { + pdir = ''; } - //console.log('base: ' + pdir + uid); - return pdir + uid; + //console.log('fm_get_base base: ' + pdir + uid); + return pdir; } function fm_dok_editor_init(uid) { var base = fm_get_path(uid); edCount = 0; - //console.log("calling tinymce.init with base: " + base + "/"); + //console.log("fm_dok_editor_init calling tinymce.init with base: " + base + "/"); /* * vgl. @@ -144,8 +186,8 @@ selector: "textarea.text-editor", statusbar: false, menubar: false, - 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', + 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'}, @@ -157,6 +199,8 @@ importcss_append: true, width: "100%", height: '100%', + relative_urls : true, + convert_urls : false, document_base_url : base + "/", setup: function (editor) { ed = editor; @@ -187,24 +231,6 @@ } sendFile(dateien.pop()); }; -} - -function sendFile(datei) { - var uri = "../api/upload"; - var xhr = new XMLHttpRequest(); - var fd = new FormData(); - xhr.open("POST", uri, true); - xhr.onreadystatechange = function() { - if (xhr.readyState == 4 && xhr.status == 200) { - fm_get_list(pfad); - if(dateien.length > 0) { - sendFile(dateien.pop()); - } - } - }; - fd.append('dateiauswahlfeld', datei); - fd.append('pfad', pfad); - xhr.send(fd); } /* ----- Uploader Ende --------------- */ @@ -248,6 +274,7 @@ */ function fm_gewaehlte_dateien() { var gewaehlte = $('.datei-gewaehlt'); + /* //console.log('anzahl: ' + gewaehlte.length); var fnames = new Array(); var i = 0; @@ -263,7 +290,31 @@ // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]} // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat return liste; + */ + return fm_dateiliste_bilden(gewaehlte); } + +function fm_dateiliste_bilden(gewaehlte) { + var fnames = new Array(); + var i = 0; + while(i < gewaehlte.length) { + var str = { "java.lang.String": $(gewaehlte[i]).text()}; + fnames.push(str); + //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text()); + //i += 2; + i++; + } + var liste = '{"List":' + JSON.stringify(fnames) + '}'; + // 'liste' enthaelt: + // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]} + // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat + return liste; +} + +function fm_menu_html_export() { + fm_export_html(); +} + /* --------- Dateifunktionen Ende ---------- */ function fm_menu_test() { @@ -277,14 +328,42 @@ } } -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_menu_compile() { + fm_compile('0', fm_mark_compile_results_in_editor); +} +function fm_menu_compile_all() { + fm_compile_all(); +} + +function fm_menu_build_app() { + fm_build_app(); +} + +function fm_mark_compile_results_in_editor(resp) { + cm.clearGutter("breakpoints"); + + if(resp.List[0].CompilerIssue !== undefined) { + cm.setGutterMarker(0, "breakpoints", makeMarker("Code hat Fehler")); + var lno; + var eMsg; + if(resp.List[0].CompilerIssue instanceof Array) { + var issueNo = 0; + while(issueNo < resp.List[0].CompilerIssue.length) { + // console.log(resp.List[0].CompilerIssue[issueNo].kind); + // console.log(resp.List[0].CompilerIssue[issueNo].lineNumber); + // console.log(resp.List[0].CompilerIssue[issueNo].sourceName); + // console.log(resp.List[0].CompilerIssue[issueNo].message); + lno = resp.List[0].CompilerIssue[issueNo].lineNumber; + eMsg = resp.List[0].CompilerIssue[issueNo].kind + ' ' + resp.List[0].CompilerIssue[issueNo].message; + cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg)); + issueNo++; + } + } else { + lno = resp.List[0].CompilerIssue.lineNumber; + eMsg = resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message; + cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg)); + } + } } function fm_ansicht_umschalten() { @@ -478,59 +557,7 @@ } /* ----- API Calls ------------- */ -function fm_get_login() { - var m = '?c=de.uhilger.filecms.pub.SessionManager&m=getSessionUser'; - var u = '../pub' + m; - fm_get(u, "text", function(resp) { - userid = resp; - $('#userMenu').text(resp); - }); -} -function fm_get_new_folder() { - $('#modal_ok').click(function() { - // hier speichern - 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); - }); - }); - $('#saveModalTitle').text('Neuer Ordner'); - $('#dialogfrage').text("Name?"); - $('#dateiname').val(''); - $('#dateiname').attr('placeholder', 'Ordnername'); - $('#saveModal').modal({ - keyboard: false, - show: true - }); -} - -function fm_get_file_content(typ) { - var gewaehlte = $('.datei-gewaehlt'); - //var fname = $(gewaehlte).find('.dateiname').text(); - - var fname = $(gewaehlte[0]).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) { - 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'; - } - fm_text_edit(resp, mode); - } else { - fm_dok_edit(resp); - } - }); - -} function fm_view_file() { // http://localhost:8080/file-cms/ui/# @@ -551,7 +578,7 @@ $('#modal_ok').click(function() { // hier umbenennen - fm_rename_file(fname, pfad, $('#dateiname').val()) + fm_rename_file(fname, pfad, $('#dateiname').val()); }); $('#saveModalTitle').text('Datei umbenennen'); $('#dialogfrage').text("Neuer Dateiname?"); @@ -566,27 +593,10 @@ } } -function fm_rename_file(fn, p, neuerName) { - var m = '?c=de.uhilger.filecms.api.FileMgr&m=renameFile'; - 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() { +function fm_menu_datei_entpacken() { 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); - }); + fm_unzip_file(fname); } /* @@ -618,42 +628,6 @@ cutCopyOperation = 'copy'; } -/* - * Hier wird fuer eine zuvor markierte Liste von Dateien, fuer die - * Cut oder Copy gewaehlt wurde, die Operations ausgefuehrt (move oder copy) - * @returns {undefined} - */ -function fm_paste_files() { - var m; - if(cutCopyOperation === 'cut') { - //m = '?c=de.uhilger.filecms.api.FileMgr&m=moveFiles'; //&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(liste); - m = '?c=de.uhilger.filecms.api.FileMgr&m=moveFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles); - } else { - //m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles'; //&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(liste); - m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles); - } - var u = '../svc' + m; - fm_get(u, "text", function(resp) { - // console.log('deleteFiles gab folgendes zurueck: ' + resp); - fm_get_list(pfad); - }); - /* - fm_post(u, {p1: encodeURIComponent(cutCopySrcDir), p2: encodeURIComponent(pfad), p3: encodeURIComponent(cutCopyFiles)},'text', function(resp) { - // resp evtl. zeigen.. - fm_get_list(pfad); - }); - */ -} - -function fm_del_files() { - var liste = fm_gewaehlte_dateien(); - var m = '?c=de.uhilger.filecms.api.FileMgr&m=deleteFiles&p=' + pfad + '&p=' + encodeURIComponent(liste); - var u = '../svc' + m; - fm_get(u, "text", function(resp) { - // console.log('deleteFiles gab folgendes zurueck: ' + resp); - fm_get_list(pfad); - }); -} function fm_render_list(fl) { if(modus == 'kacheln') { @@ -694,81 +668,6 @@ */ } -// http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p= -function fm_get_list(relPfad) { - $('#ansicht').attr('onclick','').unbind('click'); - var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad; - var u = '../svc' + m; - fm_get(u, "json", function(resp) { - - if(resp.List[0].FileRef !== undefined) { - var files = new Array(); - if(resp.List[0].FileRef instanceof Array) { - for(var i = 0; i < resp.List[0].FileRef.length; i++) { - files.push(new FileRef(resp.List[0].FileRef[i])); - } - } else { - files.push(new FileRef(resp.List[0].FileRef)); - } - var fl = new FileList(files); - fm_render_list(fl); - } else { - $('#dateien').empty(); - } - - // Breadcrumb-Ansicht - var template; - $('.breadcrumb-item').attr('onclick','').unbind('click'); - $('#bcnav').empty(); - var dirList = new Array(); - var rp = ''; - //console.log("'" + relPfad + "'"); - var dirs = relPfad.split('/'); - //console.log(dirs.length); - dirList.push(new BcrFile(rp, 'Home')); - if(relPfad.length > 0) { - for(var i = 0; i < dirs.length - 1; i++) { - if(rp.length > 0 ) { - dirList.push(new BcrFile(rp + '/' + dirs[i], dirs[i])); - rp = rp + '/' + dirs[i]; - } else { - dirList.push(new BcrFile(dirs[i], dirs[i])); - rp = dirs[i]; - } - } - var bl = new BcrFiles(dirList); - - if(dirList.length > 0) { - template = $('#tpl-bcr').html(); - Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').html(Mustache.render(template, bl)); - } - - if(dirs.length > 0) { - dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); - template = $('#tpl-bcr2').html(); - Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - } else { - template = $('#tpl-bcr2').html(); - Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').append(Mustache.render(template, dirList[0])); - } - - $('#bcnav').append($('#tpl-bcr3').html()); - } else { - pfad = ''; - template = $('#tpl-bcr2').html(); - Mustache.parse(template); // optional, speeds up future uses - $('#bcnav').append(Mustache.render(template, dirList[0])); - $('#bcnav').append($('#tpl-bcr3').html()); - } - $('.breadcrumb-item').click(fm_bc_click); - $('#ansicht').click(fm_ansicht_umschalten); - fm_set_modus(); - }); -} - function fm_menu_datei_speichern(callback) { //var fname = $('.datei-gewaehlt').text(); var fname = openFileName; @@ -779,27 +678,6 @@ } } -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) { - // hier scheint nichts zurueckzukommen.. - }); - openFileName = saveFileName; - if(typeof (callback) !== 'function') { - - } else { - callback(); - } -} function fm_menu_datei_speichern_unter(callback) { $('#modal_ok').click(function() { @@ -823,26 +701,20 @@ }); } -function fm_logout() { - var m = '?c=de.uhilger.filecms.pub.SessionManager&m=expireSession'; - var u = '../pub' + m; - - fm_get(u, "text", function(resp) { - $('#userMenu').text('nicht angemeldet'); - window.location.href = '../logout.html'; - }); -} /* ---- 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, + gutters: ["CodeMirror-linenumbers", "breakpoints"], mode: m, viewportMargin : Infinity, tabSize: 2, @@ -852,6 +724,20 @@ }, "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; } } }); @@ -859,43 +745,34 @@ //cm.setValue(content); cm.setValue(unescapeHtml(content)); cm.getDoc().markClean(); + 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); + }); + */ } - +function makeMarker(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; +} /* -------- helper functions ----------- */ - -function fm_get(u, dtype, scallback) { - $.ajax({ - url: u, - type: "GET", - dataType: dtype, - success: scallback, - error: function (xhr, status, errorThrown) { - alert("Error: " + errorThrown + " Status: " + status + " URL: " + u); - }, - complete: function (xhr, status) { - //console.log( "The request is complete!" ); - } - - }); -} - -function fm_post(u, d, dtype, scallback) { - $.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!" ); - } - }); -} function fm_serialise(obj) { return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}'; @@ -925,81 +802,4 @@ return text; } - -/* ----- Objekte ----- */ - -function FileList(fl) { - this.files = fl; -} - -function FileRef(obj) { - var self = this; - this.fr = obj; - this.fnx; - - this.typeClass = function() { - if(modus == 'kacheln') { - if(self.fr.isDirectory) { - return 'fa-folder ordner'; - } else { - return 'fa-file datei'; - } - } else { - if(self.fr.isDirectory) { - return 'fa-folder ordner'; - } else { - return 'fa-file-o datei'; - } - } - }; - - this.mini = function() { - var miniatur = false; - var namen = self.fr.absolutePath.split('/'); - if(namen.length > 0) { - self.fnx = decodeURIComponent(namen[namen.length - 1]); - } else { - 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); - } - - }; -} - -function BcrFiles(fl) { - this.files = fl; -} - -function BcrFile(rp, n) { - this.relPath = rp; - this.fName = n; -} -- Gitblit v1.9.3