From 47e9d48f23fb2803f9c6cc80e48b2b3884d4841f Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 06 Mar 2017 07:05:03 +0000 Subject: [PATCH] Speichern unter --- web/ui/ui.js | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index fdaf273..014e801 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -24,6 +24,7 @@ var openEditor; var userid; var tmo; +var tmo2; var cutCopySrcDir; var cutCopyFiles; var cutCopyOperation; @@ -379,8 +380,15 @@ fm_filectls_hide(); fm_dok_editor_init(userid); $("#mce-editor").show(); - ed.setContent(content); - openEditor = 'dok'; + + window.clearTimeout(tmo2); + tmo2 = window.setTimeout(function () { + try { + ed.setContent(content); + openEditor = 'dok'; + } catch (err) { + } + }, 200); } function fm_filectls_hide() { @@ -680,20 +688,20 @@ //var fname = $('.datei-gewaehlt').text(); var fname = openFileName; if(fname !== undefined && fname !== '') { - fm_save_file(fname); + fm_save_file(fname, 'saveTextFile'); } else { fm_menu_datei_speichern_unter(); } } -function fm_save_file(saveFileName) { +function fm_save_file(saveFileName, method) { var content; if(openEditor === 'text') { content = cm.getValue(); } else { content = ed.getContent(); } - var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile'; + var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method; var u = '../svc' + m; fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) { openFileName = saveFileName; @@ -703,7 +711,7 @@ function fm_menu_datei_speichern_unter() { $('#modal_ok').click(function() { // hier speichern - fm_save_file($('#dateiname').val()); + fm_save_file($('#dateiname').val(), 'saveTextFileAs'); }); $('#saveModalTitle').text('Datei speichern'); $('#dialogfrage').text("Dateiname?"); -- Gitblit v1.9.3