From e3043fddcaf5e3ea4beb022c04d411661a3499bd Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 14 Mar 2017 14:27:13 +0000 Subject: [PATCH] Syntax-Check fuer Java, Gutter Marker fuer Fehler, Tooltips fuer Fehlermeldungen --- web/ui/ui.js | 647 +++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 568 insertions(+), 79 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 0547019..997e9ee 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -20,19 +20,45 @@ var pfad = ''; var modus = 'kacheln'; var openFileName = ''; +var ed; +var openEditor; +var userid; +var tmo; +var tmo2; +var cutCopySrcDir; +var cutCopyFiles; +var cutCopyOperation; +var loc; +var PERS_DIR = "Persoenlich"; +var PUB_DIR = "Oeffentlich"; +var compilerIssues; function fm_init() { + $("#mce-editor").hide(); $('.codeeditor-space').hide(); $('.code-editor-container').hide(); //$('.ost').attr('flex-basis', 0); $('#newTextFile').on('click', fm_menu_neue_textdatei); + $('#newDoc').on('click', fm_menu_neues_dokument); $('#newFolder').on('click', fm_get_new_folder); - $('#editTextFile').on('click', fm_get_file_content); + $('#viewFile').on('click', fm_view_file); + $('#editTextFile').on('click', function() { + fm_get_file_content('text'); + }); + $('#editDocFile').on('click', function() { + fm_get_file_content('dok'); + }); $('#saveFile').on('click', fm_menu_datei_speichern); $('#saveFileAs').on('click', fm_menu_datei_speichern_unter); $('#closeFile').on('click', fm_menu_datei_schliessen); + $('#renameFile').on('click', fm_menu_datei_umbenennen); $('#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-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'); }); @@ -40,6 +66,106 @@ 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() { + window.clearTimeout(tmo); + tmo = window.setTimeout(function () { + try { + var myHeight = $('.zentrum').height() - $('.nord').height() - 4; + ed.theme.resizeTo('100%', myHeight); // sets the dimensions of the editable area + } catch (err) { + } + }, 200); +} + +function fm_get_path(uid) { + //console.log('pfad: ' + pfad); + var restdir; + 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); + } + var pdir = fm_get_base(uid); + //console.log('path: ' + pdir + "/" + restdir); + if(restdir.length > 1) { + return pdir + "/" + restdir; + } else { + return pdir; + } +} + +function fm_get_base(uid) { + //console.log('pfad: ' + pfad); + var pdir; + if(pfad.indexOf(PUB_DIR) > -1) { + pdir = '/data/'; + } else if(pfad.indexOf(PERS_DIR) > -1) { + pdir = '/home/'; + } + //console.log('base: ' + pdir + uid); + return pdir + uid; +} + +function fm_dok_editor_init(uid) { + var base = fm_get_path(uid); + edCount = 0; + //console.log("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(ed !== undefined) { + ed.destroy(); + } + 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 print preview save table textcolor importcss', + toolbar: 'undo redo | styleselect | image | 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%', + document_base_url : base + "/", + setup: function (editor) { + ed = editor; + } + }); + + $(window).on('resize', fm_resize_editor); + fm_resize_editor(); } /* ----- Uploader Anfang ----------*/ @@ -78,31 +204,68 @@ } }; fd.append('dateiauswahlfeld', datei); + fd.append('pfad', pfad); xhr.send(fd); } /* ----- Uploader Ende --------------- */ +/* ------- Dateifunktionen Start ----------- */ + +function fm_menu_cut() { + //alert('fm_menu_cut'); + fm_cut_files(); +} +function fm_menu_copy() { + //alert('fm_menu_copy'); + fm_copy_files(); +} +function fm_menu_paste() { + //alert('fm_menu_paste'); + fm_paste_files(); +} function fm_menu_delete() { $('#confirmOk').click(function() { - // hier loeschen + $('#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?"); - - /*var fname = $('.datei-gewaehlt').text(); - if(fname !== undefined) { - $('#dateiname').val(fname); - } else { - $('#dateiname').val(''); - }*/ - //$('#dateiname').attr('placeholder', 'Dateiname'); $('#confirmModal').modal({ keyboard: false, show: true }); } + +/* + * Gewaehlte Dateien feststellen + * + * @returns {String} eine per JSON.stringify schon vorbereitete List zum + * Absenden als Parameter an den Server + */ +function fm_gewaehlte_dateien() { + var gewaehlte = $('.datei-gewaehlt'); + //console.log('anzahl: ' + gewaehlte.length); + 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; +} +/* --------- Dateifunktionen Ende ---------- */ function fm_menu_test() { var w = $('.ost').width(); @@ -113,6 +276,31 @@ $('.ost').empty(); $('.ost').width(0); } +} + +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, "json", function(resp) { + cm.clearGutter("breakpoints"); + + if(resp.List[0].CompilerIssue !== undefined) { + 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); + fm_set_code_marker(resp.List[0].CompilerIssue[issueNo].lineNumber, resp.List[0].CompilerIssue[issueNo].kind + ' ' + resp.List[0].CompilerIssue[issueNo].message); + issueNo++; + } + } else { + fm_set_code_marker(resp.List[0].CompilerIssue.lineNumber, resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message); + } + } + }); } function fm_ansicht_umschalten() { @@ -142,14 +330,64 @@ fm_text_edit('Neue Datei'); } +function fm_menu_neues_dokument() { + fm_dok_edit(''); +} + 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(); - cm.toTextArea(); - $('#bcnav').show(); - $('#dateien').show(); + $("#mce-editor").hide(); + if(cm !== undefined) { + cm.toTextArea(); + } openFileName = ''; + openEditor = ''; fm_get_list(pfad); + fm_filectls_show(); } function fm_dateiwahl(ev) { @@ -169,7 +407,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 { @@ -220,20 +458,47 @@ } } -function fm_text_edit(content) { - $('#bcnav').hide(); - $('#dateien').hide(); +function fm_text_edit(content, mode) { + fm_filectls_hide(); $('.codeeditor-space').show(); $('.code-editor-container').show(); - fm_code_edit(content); + fm_code_edit(content, mode); + openEditor = 'text'; } +function fm_dok_edit(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); +} + +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 ------------- */ 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); }); } @@ -257,7 +522,7 @@ }); } -function fm_get_file_content() { +function fm_get_file_content(typ) { var gewaehlte = $('.datei-gewaehlt'); //var fname = $(gewaehlte).find('.dateiname').text(); @@ -266,36 +531,144 @@ var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname; var u = '../svc' + m; fm_get(u, "text", function(resp) { - fm_text_edit(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_del_files() { +function fm_view_file() { + // http://localhost:8080/file-cms/ui/# + // http://localhost:8080/file-cms/data/admin/usw. + + var userid = $('#userMenu').text(); var gewaehlte = $('.datei-gewaehlt'); - //console.log('anzahl: ' + gewaehlte.length); - 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 fname = $(gewaehlte[0]).text(); + + var path = fm_get_path(userid); + + window.open(path + '/' + fname, '_blank'); +} + +function fm_menu_datei_umbenennen() { + var gewaehlte = $('.datei-gewaehlt'); + var fname = $(gewaehlte[0]).text(); + + $('#modal_ok').click(function() { + // hier umbenennen + fm_rename_file(fname, pfad, $('#dateiname').val()) + }); + $('#saveModalTitle').text('Datei umbenennen'); + $('#dialogfrage').text("Neuer Dateiname?"); + + if(fname !== undefined) { + $('#dateiname').val(fname); + $('#dateiname').attr('placeholder', 'Dateiname'); + $('#saveModal').modal({ + keyboard: false, + show: true + }); } - - 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 - +} + +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() { + 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); + }); +} + +/* + * Hier merkt sich die Dateiverwalting die markierten Dateien fuer + * eine Dateioperation. Bei cut wird in der 'paste' Operation auf dem Server + * fuer die 'gemerkten' Dateien ein Move gemacht. Die Dateien werden + * vom gewaehlten Ort zum Zielort verschoben. + * + * @returns {undefined} + */ +function fm_cut_files() { + cutCopySrcDir = pfad; + cutCopyFiles = fm_gewaehlte_dateien(); + cutCopyOperation = 'cut'; +} + +/* + * Hier merkt sich die Dateiverwalting die markierten Dateien fuer + * eine Dateioperation. Bei copy wird in der 'paste' Operation auf dem Server + * fuer die 'gemerkten' Dateien eine Kopie gemacht. Die Dateien werden + * am gewaehlten Ort behalten und am Zielort wird eine Kopier der + * gewaehlten DAteien erstellt + * + * @returns {undefined} + */ +function fm_copy_files() { + cutCopySrcDir = pfad; + cutCopyFiles = fm_gewaehlte_dateien(); + 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) { @@ -316,6 +689,25 @@ $('#dateien').html(Mustache.render(template, fl)); $('.datei-zeile').click(fm_dateiwahl); } + /* + if(modus == 'kacheln') { + // Kachelansicht + $.get('tpl-kacheln.txt', function(template) { + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.figure').click(fm_dateiwahl); + }); + $('.datei-zeile').attr('onclick','').unbind('click'); + } else { + // Listenansicht + $.get('tpl-liste.txt', function(template) { + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.datei-zeile').click(fm_dateiwahl); + }); + $('.figure').attr('onclick','').unbind('click'); + } + */ } // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p= @@ -361,7 +753,7 @@ } } var bl = new BcrFiles(dirList); - + if(dirList.length > 0) { template = $('#tpl-bcr').html(); Mustache.parse(template); // optional, speeds up future uses @@ -390,39 +782,46 @@ $('.breadcrumb-item').click(fm_bc_click); $('#ansicht').click(fm_ansicht_umschalten); fm_set_modus(); - }); -} - -function fm_menu_datei_speichern() { - //var fname = $('.datei-gewaehlt').text(); - var fname = openFileName; - if(fname !== undefined && fname !== '') { - fm_save_file(fname); - } else { - fm_menu_datei_speichern_unter(); - } -} - -function fm_save_file(saveFileName) { - var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile'; - var u = '../svc' + m; - fm_post(u, {p1: pfad, p2: saveFileName, p3: cm.getValue()}, function(resp) { - openFileName = saveFileName; }); } -function fm_menu_datei_speichern_unter() { - - $('#modal_ok').click(function() { - // hier speichern - fm_save_file($('#dateiname').val()); - /* - var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile'; - var u = '../svc' + m; - fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) { +function fm_menu_datei_speichern(callback) { + //var fname = $('.datei-gewaehlt').text(); + var fname = openFileName; + if(fname !== undefined && fname !== '') { + fm_save_file(fname, 'saveTextFile', callback); + } else { + fm_menu_datei_speichern_unter(callback); + } +} - }); - */ +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() { + $('#modal_ok').attr('onclick','').unbind('click'); + // hier speichern + fm_save_file($('#dateiname').val(), 'saveTextFileAs', callback); }); $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); @@ -453,11 +852,17 @@ /* ---- codemirror editor handling -------- */ -function fm_code_edit(content) { +function htmlDecode(value){ + return $('<div/>').html(value).text(); +} + +function fm_code_edit(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { lineNumbers: true, - mode: "xml", + gutters: ["CodeMirror-linenumbers", "breakpoints"], + mode: m, viewportMargin : Infinity, + tabSize: 2, extraKeys: { "F9": function(cm) { cm.setOption("fullScreen", !cm.getOption("fullScreen")); @@ -467,7 +872,34 @@ } } }); - cm.setValue(content); + //cm.setValue(htmlDecode(content)); + //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'); + }); +} + +function fm_set_code_marker(lineNumber, message) { + cm.setGutterMarker(lineNumber-1, "breakpoints", makeMarker(message)); +} + +function makeMarker(msg) { + var marker = document.createElement("div"); + marker.style.color = "#822"; + marker.innerHTML = "●"; + //marker.message = msg; + $(marker).tooltip({ + placement: 'right', + title: msg, + offset: '10 -10' + }); + return marker; } @@ -490,12 +922,12 @@ }); } -function fm_post(u, d, scallback) { +function fm_post(u, d, dtype, scallback) { $.ajax({ url: u, data: d, type: "POST", - dataType: "json", + dataType: dtype, success: scallback, error: function (xhr, status, errorThrown) { $('#fehler').html("Error: " + errorThrown + " Status: " + status); @@ -510,6 +942,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) { @@ -519,30 +976,62 @@ function FileRef(obj) { var self = this; this.fr = obj; + this.fnx; this.typeClass = function() { if(modus == 'kacheln') { if(self.fr.isDirectory) { - return 'fa-folder'; + return 'fa-folder ordner'; } else { - return 'fa-file'; + return 'fa-file datei'; } } else { if(self.fr.isDirectory) { - return 'fa-folder'; + return 'fa-folder ordner'; } else { - return 'fa-file-o'; + return 'fa-file-o datei'; } } }; - 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