From scm@users.nuiton.org Tue Jun 16 08:54:15 2015
From: "nuiton.org scm" <scm@users.nuiton.org>
To: scmwebeditor-commits@list.nuiton.org
Subject:
 [Scmwebeditor-commits] 01/01: Add syntax highlighting for Markdown	files
Date: Tue, 16 Jun 2015 08:54:15 +0000
Message-ID: <20150616085415.4D06F5CA34D@goh.codelutin.com>
In-Reply-To: <20150616085414.7787.18266@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0953873494916942284=="

--===============0953873494916942284==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/P=
reviewAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ac=
tions/PreviewAction.java
index 7007ca6..0a6f933 100644
--- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewA=
ction.java
+++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/PreviewA=
ction.java
@@ -100,6 +100,7 @@ public class PreviewAction extends AbstractScmWebEditorAc=
tion implements Servlet
             }
         } else if (format.equals("md")) {
=20
+            // 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.js=
p 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=3D"webjars/codemirror/5.1/addon/search/searchcursor.js" type=
=3D"text/javascript"></script>
=20
   <script src=3D"webjars/codemirror/5.1/mode/rst/rst.js"></script>
+  <script src=3D"webjars/codemirror/5.1/mode/markdown/markdown.js"></script>
   <script src=3D"webjars/codemirror/5.1/mode/clike/clike.js"></script>
   <script src=3D"webjars/codemirror/5.1/mode/htmlmixed/htmlmixed.js"></scrip=
t>
   <script src=3D"webjars/codemirror/5.1/mode/javascript/javascript.js"></scr=
ipt>
diff --git a/swe-ui-web/src/main/webapp/codemirror-ui/js/codemirror-ui.js b/s=
we-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 =3D {
     optRst.appendChild(optRstContent);
     select.appendChild(optRst);
=20
+    var optMd =3D document.createElement("option");
+    optMd.value =3D "markdown";
+    var optMdContent =3D document.createTextNode("Markdown");
+    optMd.appendChild(optMdContent);
+    select.appendChild(optMd);
+
     var optJs =3D document.createElement("option");
     optJs.value =3D "javascript";
     var optJsContent =3D 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) {
 =09
 	var typeEditor =3D null;
 =09
-	if(typeEditor =3D=3D null && mimetype !=3D null) {
+	if(typeEditor =3D=3D=3D null && mimetype !=3D=3D null) {
=20
         if(contains(mimetype, "rst") ) {
             typeEditor=3D"rst";
             document.getElementById('language').selectedIndex =3D 1;
+        } else if(contains(mimetype, "markdown")) {
+            typeEditor=3D"markdown";
+            document.getElementById('language').selectedIndex =3D 2;
         } else if(contains(mimetype, "javascript")) {
             typeEditor=3D"javascript";
-            document.getElementById('language').selectedIndex =3D 2;
+            document.getElementById('language').selectedIndex =3D 3;
         } else if(contains(mimetype, "html") ) {
             typeEditor=3D"text/html";
-            document.getElementById('language').selectedIndex =3D 3;
+            document.getElementById('language').selectedIndex =3D 4;
         } else if( contains(mimetype, "xml") ) {
             typeEditor=3D"xml";
-            document.getElementById('language').selectedIndex =3D 4;
+            document.getElementById('language').selectedIndex =3D 5;
         } else if( contains(mimetype, "java/application") ) {
             typeEditor=3D"text/x-java";
-            document.getElementById('language').selectedIndex =3D 5;
+            document.getElementById('language').selectedIndex =3D 6;
         } else if(contains(mimetype, "text/css") ) {
             typeEditor=3D"css";
-            document.getElementById('language').selectedIndex =3D 6;
+            document.getElementById('language').selectedIndex =3D 7;
         } else if(contains(mimetype, "x-tex") ) {
             typeEditor=3D"text/stex";
-            document.getElementById('language').selectedIndex =3D 7;
+            document.getElementById('language').selectedIndex =3D 8;
         }
     }
    =20
-    if (typeEditor=3D=3Dnull && format!=3Dnull) {
+    if (typeEditor =3D=3D=3D null && format !=3D=3D null) {
=20
         if (format =3D=3D=3D "rst") {
 	        typeEditor=3D"rst";
 =09
 	        document.getElementById('language').selectedIndex =3D 1;
        =20
+        } else if(format =3D=3D=3D "md") {
+            typeEditor=3D"markdown";
+
+            document.getElementById('language').selectedIndex =3D 2;
+
         } else if(format =3D=3D=3D "javascript") {
         	typeEditor=3D"javascript";
    =20
-        	document.getElementById('language').selectedIndex =3D 2;
+        	document.getElementById('language').selectedIndex =3D 3;
                            =20
         } else if(format =3D=3D=3D "html") {
         	typeEditor=3D"text/html";
     =20
-        	document.getElementById('language').selectedIndex =3D 3;
+        	document.getElementById('language').selectedIndex =3D 4;
      =20
         } else if(format =3D=3D=3D "xml") {
         	typeEditor=3D"xml";
     =20
-        	document.getElementById('language').selectedIndex =3D 4;
+        	document.getElementById('language').selectedIndex =3D 5;
=20
         } else if(format =3D=3D=3D "java") {
         	typeEditor=3D"text/x-java";
=20
-        	document.getElementById('language').selectedIndex =3D 5;
+        	document.getElementById('language').selectedIndex =3D 6;
=20
         } else if(format =3D=3D=3D "css") {
        	    typeEditor=3D"css";
         =20
-    	    document.getElementById('language').selectedIndex =3D 6;
+    	    document.getElementById('language').selectedIndex =3D 7;
                        =20
         } else if(format =3D=3D=3D "tex") {
             typeEditor=3D"text/stex";
             =20
-            document.getElementById('language').selectedIndex =3D 7;
+            document.getElementById('language').selectedIndex =3D 8;
=20
         }
     }

--=20
To stop receiving notification emails like this one, please contact
nuiton.org SCM administrator <admin+scm@nuiton.org>.

--===============0953873494916942284==--


From scm@users.nuiton.org Tue Jun 16 08:54:15 2015
From: "nuiton.org scm" <scm@users.nuiton.org>
To: scmwebeditor-commits@list.nuiton.org
Subject: [Scmwebeditor-commits] branch develop updated (0afabfb -> 0b94f10)
Date: Tue, 16 Jun 2015 08:54:14 +0000
Message-ID: <20150616085414.7787.18266@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3882494582923091955=="

--===============3882494582923091955==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New change to branch develop in repository scmwebeditor.

See http://git.nuiton.org/scmwebeditor.git

      from  0afabfb   Add the support of SVG files: when opening one, SCMWebE=
ditor asks the user if he wants to edit the code or view the image
       new  0b94f10   Add syntax highlighting for Markdown files

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit 0b94f109698916ce9556c008267358434cf3f003
Author: Hugo PIGEON <hpigeon@codelutin.com>
Date:   Tue Jun 16 10:53:19 2015 +0200

    Add syntax highlighting for Markdown files

Summary of changes:
 .../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(-)

--=20
To stop receiving notification emails like this one, please contact
nuiton.org SCM administrator <admin+scm@nuiton.org>.

--===============3882494582923091955==--