From 3ad4db4a15b4ba59c65e2af797967941f2cb2ba2 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Tue, 21 Feb 2017 13:40:24 +0000 Subject: [PATCH] SessionManager angepasst --- web/ui/ui.js | 50 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 4895b59..f4dcedf 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -6,7 +6,7 @@ $('.code-editor-container').hide(); $('#newTextFile').on('click', fm_menu_neue_textdatei); $('#newFolder').on('click', fm_menu_neuer_ordner); - $('#editTextFile').on('click', fm_menu_textdatei_bearbeiten); + $('#editTextFile').on('click', fm_get_file_content); $('#saveFile').on('click', fm_menu_datei_speichern); $('#closeFile').on('click', fm_menu_datei_schliessen); $('#saveModal').on('hidden.bs.modal', function (e) { @@ -18,20 +18,13 @@ } function fm_menu_neue_textdatei() { - $('#dateiansicht').hide(); - $('.codeeditor-space').show(); - $('.code-editor-container').show(); - fm_code_edit('Test'); -} - -function fm_menu_textdatei_bearbeiten() { /* $('#dateiansicht').hide(); $('.codeeditor-space').show(); $('.code-editor-container').show(); fm_code_edit('Test'); */ - fm_get_file_content(); + fm_text_edit('Test'); } function fm_menu_datei_schliessen() { @@ -80,13 +73,20 @@ //console.log($(elem).text() + ' ' + $(elem).attr('rpath') + ' ' + $(elem).hasClass('active')); } +function fm_text_edit(content) { + $('#dateiansicht').hide(); + $('.codeeditor-space').show(); + $('.code-editor-container').show(); + fm_code_edit(content); +} + /* ----- API Calls ------------- */ function fm_get_login() { - var m = '?c=de.uhilger.um.pub.SessionManager&m=getSessionUser'; - var u = '../../um/pub' + m; - fm_get(u, "json", function(resp) { - $('#userMenu').text(resp.UserData.firstName); + var m = '?c=de.uhilger.filecms.pub.SessionManager&m=getSessionUser'; + var u = '../pub' + m; + fm_get(u, "text", function(resp) { + $('#userMenu').text(resp); }); } @@ -123,14 +123,18 @@ //console.log(pfad + '/' + fname); - - /* - var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPath; + var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname; var u = '../svc' + m; - fm_get(u, "json", function(resp) { - + fm_get(u, "text", function(resp) { + /* + $('#dateiansicht').hide(); + $('.codeeditor-space').show(); + $('.code-editor-container').show(); + fm_code_edit(resp); + */ + fm_text_edit(resp); }); - */ + } // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p= @@ -220,7 +224,13 @@ }); $('.modal-title').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); - $('#dateiname').val(''); + + var fname = $('.datei-gewaehlt').text(); + if(fname !== undefined) { + $('#dateiname').val(fname); + } else { + $('#dateiname').val(''); + } $('#dateiname').attr('placeholder', 'Dateiname'); $('#saveModal').modal({ keyboard: false, -- Gitblit v1.9.3