From ea1ae0d0da0d945518a99e7d6e96670e7e28fb45 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Mon, 06 Mar 2017 16:20:27 +0000 Subject: [PATCH] eigene Stile fuer TinyMCE; Link zur Hauptseite auf Login-Form --- web/ui/ui.js | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index fdaf273..ddf9e16 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; @@ -128,7 +129,7 @@ selector: "textarea.text-editor", statusbar: false, menubar: false, - plugins: 'advlist charmap code image link lists media print preview save table textcolor', + plugins: 'advlist charmap code image link lists media print preview save table textcolor importcss', toolbar: 'undo redo | styleselect | image | link unlink | bullist numlist | outdent indent | code', /* menu: { @@ -138,6 +139,7 @@ }, */ resize: 'both', + importcss_append: true, width: "100%", height: '100%', document_base_url : base + "/", @@ -379,8 +381,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 +689,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 +712,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?"); @@ -734,6 +743,10 @@ /* ---- codemirror editor handling -------- */ +function htmlDecode(value){ + return $('<div/>').html(value).text(); +} + function fm_code_edit(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { lineNumbers: true, @@ -748,7 +761,7 @@ } } }); - cm.setValue(content); + cm.setValue(htmlDecode(content)); } -- Gitblit v1.9.3