From 3c4b104eb3d9bf4e651dffbbd956985764bcacce Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 28 Feb 2017 07:19:53 +0000 Subject: [PATCH] getBase angepasst --- web/ui/ui.js | 353 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 176 insertions(+), 177 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index db82e7a..1896636 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -21,7 +21,9 @@ var modus = 'kacheln'; var openFileName = ''; var ed; -var t; +var openEditor; +var userid; +var tmo; function fm_init() { $("#mce-editor").hide(); @@ -31,7 +33,13 @@ $('#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); @@ -44,17 +52,77 @@ 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", + selector: "textarea.text-editor", statusbar: false, menubar: false, - plugins: 'autoresize advlist charmap code image link lists media print preview save table textcolor', - toolbar: 'undo redo | styleselect | outdent indent', + 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'}, @@ -62,64 +130,17 @@ view: {title: 'View', items: 'visualaid | code | link image media | template hr'}, }, */ - resize: true, + resize: 'both', width: "100%", height: '100%', - autoresize_bottom_margin : 1, + document_base_url : base + "/", setup: function (editor) { ed = editor; - //self.ed = editor; - /* - editor.addMenuItem('fileinfo', { - text: 'Toggle file info', - onclick: function () { - editor.insertContent('Toggle file info'); - toggleFileInfo(); - } - }); - editor.addMenuItem('savevers', { - text: 'Speichern', - onclick: function () { - self.notizSpeichern(); - } - }); - editor.addMenuItem('exit', { - text: 'Exit', - onclick: function () { - self.editorBeenden(); - } - }); - */ } }); -} - -function resizeEditor(myHeight) { - window.console.log('resizeEditor'); - var myEditor = ed; - if (myEditor) { - try { - /* - if (!myHeight) { - var targetHeight = window.innerHeight; // Change this to the height of your wrapper element - var mce_bars_height = 0; - $('.mce-toolbar, .mce-statusbar, .mce-menubar').each(function () { - mce_bars_height += $(this).height(); - }); - window.console.log('mce bars height total: ' + mce_bars_height); - myHeight = targetHeight - mce_bars_height - 8; // the extra 8 is for margin added between the toolbars - } - */ - var myHeight = $('.zentrum').height() - $('.nord').height(); - window.console.log('resizeEditor: ', myHeight); - myEditor.theme.resizeTo('100%', myHeight); // sets the dimensions of the editable area - } catch (err) { - } - } -} - -window.onresize = function() { - resizeEditor(); + + $(window).on('resize', fm_resize_editor); + fm_resize_editor(); } /* ----- Uploader Anfang ----------*/ @@ -158,6 +179,7 @@ } }; fd.append('dateiauswahlfeld', datei); + fd.append('pfad', pfad); xhr.send(fd); } @@ -223,16 +245,7 @@ } function fm_menu_neues_dokument() { - fm_filectls_hide(); - $("#mce-editor").show(); - resizeEditor(); - /* - var ht = $(window).innerHeight() - 20; - window.clearTimeout(t); - t = window.setTimeout(function () { - $('.mce-editor').height(ht - 100); - }, 200); - */ + fm_dok_edit(''); } function fm_menu_datei_schliessen() { @@ -243,6 +256,7 @@ cm.toTextArea(); } openFileName = ''; + openEditor = ''; fm_get_list(pfad); fm_filectls_show(); } @@ -315,11 +329,20 @@ } } -function fm_text_edit(content) { +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() { @@ -337,7 +360,9 @@ 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); }); } @@ -360,7 +385,7 @@ }); } -function fm_get_file_content() { +function fm_get_file_content(typ) { var gewaehlte = $('.datei-gewaehlt'); //var fname = $(gewaehlte).find('.dateiname').text(); @@ -369,9 +394,34 @@ 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() { @@ -404,6 +454,24 @@ function fm_render_list(fl) { if(modus == 'kacheln') { // Kachelansicht + var template = $('#tpl-kacheln').html(); + Mustache.parse(template); // optional, speeds up future uses + $('.datei-zeile').attr('onclick','').unbind('click'); + $('#dateien').empty(); + $('#dateien').html(Mustache.render(template, fl)); + $('.figure').click(fm_dateiwahl); + } else { + // Listenansicht + var template = $('#tpl-liste').html(); + Mustache.parse(template); // optional, speeds up future uses + $('.figure').attr('onclick','').unbind('click'); + $('#dateien').empty(); + $('#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)); @@ -419,6 +487,7 @@ }); $('.figure').attr('onclick','').unbind('click'); } + */ } // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p= @@ -444,7 +513,7 @@ } // Breadcrumb-Ansicht - //var template; + var template; $('.breadcrumb-item').attr('onclick','').unbind('click'); $('#bcnav').empty(); var dirList = new Array(); @@ -464,112 +533,36 @@ } } var bl = new BcrFiles(dirList); - - if(dirList.length > 0) { - $.get('tpl-bcr.txt', function(template) { - $('#bcnav').html(Mustache.render(template, bl)); - //fm_bcr_step2(dirs, dirList); - - if(dirs.length > 0) { - dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - fm_bcr_3(); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - } else { - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[0])); - fm_bcr_3(); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[0])); - } - - }); - } else { - //fm_bcr_step2(dirs, dirList); - /* - if(dirs.length > 0) { - dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - $('#bcnav').append($('#tpl-bcr3').html()); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - } else { - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[0])); - $('#bcnav').append($('#tpl-bcr3').html()); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[0])); - } - */ + + 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 = ''; - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[0])); - fm_bcr_3(); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[0])); - //$('#bcnav').append($('#tpl-bcr3').html()); + 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_bcr_step2(dirs, dirList) { - if(dirs.length > 0) { - dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1])); - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - $('#bcnav').append($('#tpl-bcr3').html()); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1])); - } else { - $.get('tpl-bcr2.txt', function(template) { - $('#bcnav').append(Mustache.render(template, dirList[0])); - $('#bcnav').append($('#tpl-bcr3').html()); - fm_bcr_end(); - }); - //template = $('#tpl-bcr2').html(); - //Mustache.parse(template); // optional, speeds up future uses - //$('#bcnav').append(Mustache.render(template, dirList[0])); - } -} -*/ - -function fm_bcr_3() { - $.get('tpl-bcr3.txt', function(template) { - $('#bcnav').append(template); - }); -} - -function fm_bcr_end() { - $('.breadcrumb-item').click(fm_bc_click); - $('#ansicht').click(fm_ansicht_umschalten); - fm_set_modus(); + $('.breadcrumb-item').click(fm_bc_click); + $('#ansicht').click(fm_ansicht_umschalten); + fm_set_modus(); + }); } function fm_menu_datei_speichern() { @@ -583,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; }); } @@ -632,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) { -- Gitblit v1.9.3