add HightlightJS

rtfpessoa · rtfpessoa · commit f21492f795e3 · 2015-01-25T00:01:17.000Z
diff --git a/dist/diff2html.css b/dist/diff2html.css
@@ -3,7 +3,7 @@
  * Diff to HTML (diff2html.css)
  * Author: rtfpessoa
  * Date: Friday 29 August 2014
- * Last Update: Saturday 27 September 2014
+ * Last Update: Sunday 25 January 2015
  *
  */
 
@@ -86,22 +86,32 @@
     margin-right: -4px;
 }
 
-.d2h-code-line {
+.d2h-code-line.hljs {
+    display: block;
     white-space: pre;
-    padding-left: 10px;
-    padding-right: 10px;
+    padding: 0 10px;
     height: 18px;
     line-height: 18px;
     margin-left: 80px;
+    /* Override HighlightJS */
+    color: inherit;
+    overflow-x: inherit;
+    background: none;
+    /* ******************** */
 }
 
 .d2h-code-side-line {
+    display: block;
     white-space: pre;
-    padding-left: 10px;
-    padding-right: 10px;
+    padding: 0 10px;
     height: 18px;
     line-height: 18px;
     margin-left: 50px;
+    /* Override HighlightJS */
+    color: inherit;
+    overflow-x: inherit;
+    background: none;
+    /* ******************** */
 }
 
 .d2h-code-line del,
diff --git a/dist/template.html b/dist/template.html
@@ -8,10 +8,29 @@
         Diff to HTML (template.html)
         Author: rtfpessoa
         Date: Friday 29 August 2014
-        Last Update: Sunday 14 September 2014
+        Last Update: Sunday 25 January 2015
     -->
 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css">
     <link rel="stylesheet" type="text/css" href="{{css}}">
+
+
+    <script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/highlight.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/languages/scala.min.js"></script>
+    <script>
+        $(document).ready(function () {
+            var code = $(".d2h-code-line");
+            code.map(function (i, line) {
+                hljs.highlightBlock(line);
+            });
+
+            var codeSide = $(".d2h-code-side-line");
+            codeSide.map(function (i, line) {
+                hljs.highlightBlock(line);
+            });
+        });
+    </script>
 </head>
 <body style="text-align: center; font-family: 'Source Sans Pro',sans-serif;">
 <h1>Diff to HTML by <a href="https://github.com/rtfpessoa">rtfpessoa</a></h1>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name":     "diff2html",
-  "version":  "0.1.6-2",
+  "version":  "0.1.6-3",
 
   "homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs",
   "description": "Fast Diff to colorized HTML",
diff --git a/src/diff2html.js b/src/diff2html.js
@@ -3,7 +3,7 @@
  * Diff to HTML (diff2html.js)
  * Author: rtfpessoa
  * Date: Friday 29 August 2014
- * Last Update: Saturday 24 January 2015
+ * Last Update: Sunday 25 January 2015
  *
  * Diff commands:
  *   git diff

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "diff2html",`
`3`		`- "version": "0.1.6-2",`
	`3`	`+ "version": "0.1.6-3",`
`4`	`4`
`5`	`5`	`"homepage": "https://www.github.com/rtfpessoa/diff2html-nodejs",`
`6`	`6`	`"description": "Fast Diff to colorized HTML",`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* Diff to HTML (diff2html.js)`
`4`	`4`	`* Author: rtfpessoa`
`5`	`5`	`* Date: Friday 29 August 2014`
`6`		`- * Last Update: Saturday 24 January 2015`
	`6`	`+ * Last Update: Sunday 25 January 2015`
`7`	`7`	`*`
`8`	`8`	`* Diff commands:`
`9`	`9`	`* git diff`