From 2b3e7ec02b0156b1ffef323d9f12e7363225cf5c Mon Sep 17 00:00:00 2001 From: Ulrich <undisclosed> Date: Tue, 28 Feb 2017 11:25:07 +0000 Subject: [PATCH] Bestimmung des Orts der Dateiablage ueber Parameter oder hart kodiert fuer WebBox-Struktur --- web/ui/ui.js | 271 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 232 insertions(+), 39 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index b4e6872..1896636 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -20,14 +20,26 @@ var pfad = ''; var modus = 'kacheln'; var openFileName = ''; +var ed; +var openEditor; +var userid; +var tmo; 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); @@ -40,6 +52,95 @@ fm_get_login(); fm_get_list(''); fm_init_uploader(); +} + +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('Oeffentlich') > -1) { + restdir = pfad.substr('Oeffentlich'.length); + } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { + restdir = pfad.substr('Persoenlicher Ordner'.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('Oeffentlich') > -1) { + pdir = '/data/'; + } else if(pfad.indexOf('Persoenlicher Ordner') > -1) { + pdir = '/home/'; + } + //console.log('base: ' + pdir + uid); + return pdir + uid; +} + +function fm_dok_editor_init(uid) { + var base = fm_get_path(uid); + //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 : "mce.css", + selector: "textarea.text-editor", + statusbar: false, + menubar: false, + plugins: 'advlist charmap code image link lists media print preview save table textcolor', + 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', + 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,6 +179,7 @@ } }; fd.append('dateiauswahlfeld', datei); + fd.append('pfad', pfad); xhr.send(fd); } @@ -88,8 +190,8 @@ // hier loeschen fm_del_files(); }); - $('.modal-title').text("Löschen"); - $('.modal-body').text("Wirklich löschen?"); + $('#confirmModalTitle').text("Löschen"); + $('#confirmModalBody').text("Wirklich löschen?"); /*var fname = $('.datei-gewaehlt').text(); if(fname !== undefined) { @@ -142,56 +244,75 @@ fm_text_edit('Neue Datei'); } +function fm_menu_neues_dokument() { + fm_dok_edit(''); +} + function fm_menu_datei_schliessen() { $('.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) { var elem = this; //console.log('dateiwahl nach click, event shift: ' + ev.shiftKey + ", event ctrl: " + ev.ctrlKey); if(modus == 'kacheln') { + // Kacheln if($(elem).children(0).hasClass('fa-folder')) { - var ordner = $(elem).text().trim(); - if(pfad.length > 0) { - pfad = pfad + '/' + ordner; + if(/*ev.shiftKey || */ ev.ctrlKey) { + $(elem).find('.dateiname').addClass('datei-gewaehlt'); } else { - pfad = ordner; + var ordner = $(elem).text().trim(); + if(pfad.length > 0) { + pfad = pfad + '/' + ordner; + } else { + pfad = ordner; + } + fm_get_list(pfad); } - fm_get_list(pfad); } else if($(elem).children(0).hasClass('fa-file')) { if(/*ev.shiftKey || */ ev.ctrlKey) { // mehrere Dateien sollen gewaehlt werden } else { $('.datei-gewaehlt').removeClass('datei-gewaehlt'); } - $(elem).children(0).addClass('datei-gewaehlt'); + $(elem).find('.dateiname').addClass('datei-gewaehlt'); } else { //console.log('kein folder oder file...'); } } else { + // Liste if($(elem).find('.datei-elem').children(0).hasClass('fa-file-o')) { + // Datei if(/*ev.shiftKey || */ ev.ctrlKey) { // mehrere Dateien sollen gewaehlt werden } else { $('.table-info').removeClass('table-info'); + $('.datei-gewaehlt').removeClass('datei-gewaehlt'); } $(elem).addClass('table-info'); - $('.datei-gewaehlt').removeClass('datei-gewaehlt'); $(elem).find('.dateiname').addClass('datei-gewaehlt'); } else { - var ordner = $(elem).find('.dateiname').text(); - if(pfad.length > 0) { - pfad = pfad + '/' + ordner; + // Ordner + if(/*ev.shiftKey || */ ev.ctrlKey) { + $(elem).children(0).addClass('datei-gewaehlt'); } else { - pfad = ordner; + var ordner = $(elem).find('.dateiname').text(); + if(pfad.length > 0) { + pfad = pfad + '/' + ordner; + } else { + pfad = ordner; + } + fm_get_list(pfad); } - fm_get_list(pfad); } } } @@ -208,21 +329,40 @@ } } -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(); + ed.setContent(content); + openEditor = 'dok'; +} + +function fm_filectls_hide() { + $('#zentrum_bc').hide(); + $('#dateien').hide(); +} + +function fm_filectls_show() { + $('#zentrum_bc').show(); + $('#dateien').show(); +} /* ----- 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); + //fm_dok_editor_init(resp); }); } @@ -235,7 +375,7 @@ fm_get_list(pfad); }); }); - $('.modal-title').text('Neuer Ordner'); + $('#saveModalTitle').text('Neuer Ordner'); $('#dialogfrage').text("Name?"); $('#dateiname').val(''); $('#dateiname').attr('placeholder', 'Ordnername'); @@ -245,34 +385,62 @@ }); } -function fm_get_file_content() { +function fm_get_file_content(typ) { var gewaehlte = $('.datei-gewaehlt'); - var fname = $(gewaehlte[1]).text(); + //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) { - 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_view_file() { + // http://localhost:8080/file-cms/ui/# + // http://localhost:8080/file-cms/data/admin/usw. + + var userid = $('#userMenu').text(); + var gewaehlte = $('.datei-gewaehlt'); + var fname = $(gewaehlte[0]).text(); + + var path = fm_get_path(userid); + + window.open(path + '/' + fname, '_blank'); } function fm_del_files() { var gewaehlte = $('.datei-gewaehlt'); //console.log('anzahl: ' + gewaehlte.length); var fnames = new Array(); - var i = 1; + 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 += 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>] + // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat var m = '?c=de.uhilger.filecms.api.FileMgr&m=deleteFiles&p=' + pfad + '&p=' + encodeURIComponent(liste); var u = '../svc' + m; @@ -301,6 +469,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= @@ -346,7 +533,7 @@ } } var bl = new BcrFiles(dirList); - + if(dirList.length > 0) { template = $('#tpl-bcr').html(); Mustache.parse(template); // optional, speeds up future uses @@ -375,7 +562,7 @@ $('.breadcrumb-item').click(fm_bc_click); $('#ansicht').click(fm_ansicht_umschalten); fm_set_modus(); - }); + }); } function fm_menu_datei_speichern() { @@ -389,9 +576,15 @@ } function fm_save_file(saveFileName) { + var content; + if(openEditor === 'text') { + content = cm.getValue(); + } else { + content = ed.getContent(); + } 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) { + fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) { openFileName = saveFileName; }); } @@ -409,7 +602,7 @@ }); */ }); - $('.modal-title').text('Datei speichern'); + $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); var fname = $('.datei-gewaehlt').text(); @@ -438,10 +631,10 @@ /* ---- codemirror editor handling -------- */ -function fm_code_edit(content) { +function fm_code_edit(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { lineNumbers: true, - mode: "xml", + mode: m, viewportMargin : Infinity, extraKeys: { "F9": function(cm) { @@ -508,15 +701,15 @@ 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'; } } }; -- Gitblit v1.9.3