From fab629ffb99008bce86082033d349f42ba13b93a Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Sun, 05 Mar 2017 08:04:40 +0000 Subject: [PATCH] redundanz bei copy und move beseitigt --- web/ui/ui.js | 69 ++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 17 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 6c07272..fdaf273 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -46,6 +46,7 @@ $('#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); @@ -123,7 +124,7 @@ * Konfiguration TinyMCE */ tinymce.init({ - content_css : "mce.css", + content_css : "/file-cms/ui/mce.css", selector: "textarea.text-editor", statusbar: false, menubar: false, @@ -385,11 +386,13 @@ 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 ------------- */ @@ -461,6 +464,38 @@ 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 + }); + } +} + +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); + }); +} + /* * Hier merkt sich die Dateiverwalting die markierten Dateien fuer * eine Dateioperation. Bei cut wird in der 'paste' Operation auf dem Server @@ -487,7 +522,7 @@ function fm_copy_files() { cutCopySrcDir = pfad; cutCopyFiles = fm_gewaehlte_dateien(); - cutCopyOperation = 'cut'; + cutCopyOperation = 'copy'; } /* @@ -497,16 +532,24 @@ */ 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); + 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(liste); + m = '?c=de.uhilger.filecms.api.FileMgr&m=copyFiles&p=' + cutCopySrcDir + '&p=' + pfad + '&p=' + encodeURIComponent(cutCopyFiles); } var u = '../svc' + m; - fm_post(u, {p1: cutCopySrcDir, p2: pfad, p3: encodeURIComponent(cutCopyFiles)}, function(resp) { + 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() { @@ -657,18 +700,10 @@ }); } -function fm_menu_datei_speichern_unter() { - +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) { - - }); - */ }); $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); @@ -736,12 +771,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); -- Gitblit v1.9.3