From 41e9f0d04b3eb3df0f5f371aa0079c4cc248ca77 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Fri, 10 Mar 2017 06:05:01 +0000 Subject: [PATCH] UploadServlet in Package web verscoben --- web/ui/ui.js | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index ddf9e16..4abc1d0 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -52,6 +52,7 @@ $('#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); $('#saveModal').on('hidden.bs.modal', function (e) { $('#modal_ok').attr('onclick','').unbind('click'); @@ -505,6 +506,18 @@ }); } +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 @@ -761,7 +774,9 @@ } } }); - cm.setValue(htmlDecode(content)); + //cm.setValue(htmlDecode(content)); + //cm.setValue(content); + cm.setValue(unescapeHtml(content)); } @@ -804,6 +819,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) { @@ -833,9 +873,9 @@ this.fileName = function() { var namen = self.fr.absolutePath.split('/'); if(namen.length > 0) { - return namen[namen.length - 1]; + return decodeURIComponent(namen[namen.length - 1]); } else { - return self.fr.absolutePath; + return decodeURIComponent(self.fr.absolutePath); } }; } -- Gitblit v1.9.3