From 942d637e33c73edd807951f8100634cd659876fa Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Mon, 06 Mar 2017 07:20:17 +0000
Subject: [PATCH] dekodieren fuer Codemirror
---
src/java/de/uhilger/filecms/api/FileMgr.java | 4 +++-
web/ui/ui.js | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/java/de/uhilger/filecms/api/FileMgr.java b/src/java/de/uhilger/filecms/api/FileMgr.java
index 183c5ff..cb4ca87 100644
--- a/src/java/de/uhilger/filecms/api/FileMgr.java
+++ b/src/java/de/uhilger/filecms/api/FileMgr.java
@@ -32,6 +32,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringEscapeUtils;
/**
*
@@ -247,13 +248,14 @@
}
logger.fine("new file: " + file.getName());
return file;
- }
+ }
private FileRef saveToFile(File targetFile, String contents) {
FileRef savedFile = null;
try {
targetFile.createNewFile();
FileWriter w = new FileWriter(targetFile);
+ //w.write(StringEscapeUtils.unescapeHtml(contents));
w.write(contents);
w.flush();
w.close();
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 014e801..f3587cb 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -742,6 +742,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,
@@ -756,7 +760,7 @@
}
}
});
- cm.setValue(content);
+ cm.setValue(htmlDecode(content));
}
--
Gitblit v1.9.3