This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 0b94f109698916ce9556c008267358434cf3f003 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Tue Jun 16 10:53:19 2015 +0200 Add syntax highlighting for Markdown files --- .../scmwebeditor/uiweb/actions/PreviewAction.java | 1 + .../webapp/WEB-INF/content/modificationViewer.jsp | 1 + .../main/webapp/codemirror-ui/js/codemirror-ui.js | 6 ++++ swe-ui-web/src/main/webapp/js/selectLanguage.js | 36 +++++++++++++--------- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java index 7007ca6..0a6f933 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewAction.java @@ -100,6 +100,7 @@ public class PreviewAction extends AbstractScmWebEditorAction implements Servlet } } else if (format.equals("md")) { + // Using txtmark to generate html document if (log.isDebugEnabled()) { log.debug("Markdown generate"); } diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index a54dfb3..19062e9 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -65,6 +65,7 @@ <script src="webjars/codemirror/5.1/addon/search/searchcursor.js" type="text/javascript"></script> <script src="webjars/codemirror/5.1/mode/rst/rst.js"></script> + <script src="webjars/codemirror/5.1/mode/markdown/markdown.js"></script> <script src="webjars/codemirror/5.1/mode/clike/clike.js"></script> <script src="webjars/codemirror/5.1/mode/htmlmixed/htmlmixed.js"></script> <script src="webjars/codemirror/5.1/mode/javascript/javascript.js"></script> diff --git a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js b/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js index ce8c957..7acd4a7 100644 --- a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js +++ b/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js @@ -229,6 +229,12 @@ CodeMirrorUI.prototype = { optRst.appendChild(optRstContent); select.appendChild(optRst); + var optMd = document.createElement("option"); + optMd.value = "markdown"; + var optMdContent = document.createTextNode("Markdown"); + optMd.appendChild(optMdContent); + select.appendChild(optMd); + var optJs = document.createElement("option"); optJs.value = "javascript"; var optJsContent = document.createTextNode("Javascript"); diff --git a/swe-ui-web/src/main/webapp/js/selectLanguage.js b/swe-ui-web/src/main/webapp/js/selectLanguage.js index 19226e0..b57741a 100644 --- a/swe-ui-web/src/main/webapp/js/selectLanguage.js +++ b/swe-ui-web/src/main/webapp/js/selectLanguage.js @@ -42,68 +42,76 @@ function selectLanguage(mimetype, format) { var typeEditor = null; - if(typeEditor == null && mimetype != null) { + if(typeEditor === null && mimetype !== null) { if(contains(mimetype, "rst") ) { typeEditor="rst"; document.getElementById('language').selectedIndex = 1; + } else if(contains(mimetype, "markdown")) { + typeEditor="markdown"; + document.getElementById('language').selectedIndex = 2; } else if(contains(mimetype, "javascript")) { typeEditor="javascript"; - document.getElementById('language').selectedIndex = 2; + document.getElementById('language').selectedIndex = 3; } else if(contains(mimetype, "html") ) { typeEditor="text/html"; - document.getElementById('language').selectedIndex = 3; + document.getElementById('language').selectedIndex = 4; } else if( contains(mimetype, "xml") ) { typeEditor="xml"; - document.getElementById('language').selectedIndex = 4; + document.getElementById('language').selectedIndex = 5; } else if( contains(mimetype, "java/application") ) { typeEditor="text/x-java"; - document.getElementById('language').selectedIndex = 5; + document.getElementById('language').selectedIndex = 6; } else if(contains(mimetype, "text/css") ) { typeEditor="css"; - document.getElementById('language').selectedIndex = 6; + document.getElementById('language').selectedIndex = 7; } else if(contains(mimetype, "x-tex") ) { typeEditor="text/stex"; - document.getElementById('language').selectedIndex = 7; + document.getElementById('language').selectedIndex = 8; } } - if (typeEditor==null && format!=null) { + if (typeEditor === null && format !== null) { if (format === "rst") { typeEditor="rst"; document.getElementById('language').selectedIndex = 1; + } else if(format === "md") { + typeEditor="markdown"; + + document.getElementById('language').selectedIndex = 2; + } else if(format === "javascript") { typeEditor="javascript"; - document.getElementById('language').selectedIndex = 2; + document.getElementById('language').selectedIndex = 3; } else if(format === "html") { typeEditor="text/html"; - document.getElementById('language').selectedIndex = 3; + document.getElementById('language').selectedIndex = 4; } else if(format === "xml") { typeEditor="xml"; - document.getElementById('language').selectedIndex = 4; + document.getElementById('language').selectedIndex = 5; } else if(format === "java") { typeEditor="text/x-java"; - document.getElementById('language').selectedIndex = 5; + document.getElementById('language').selectedIndex = 6; } else if(format === "css") { typeEditor="css"; - document.getElementById('language').selectedIndex = 6; + document.getElementById('language').selectedIndex = 7; } else if(format === "tex") { typeEditor="text/stex"; - document.getElementById('language').selectedIndex = 7; + document.getElementById('language').selectedIndex = 8; } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.