Merge pull request #15 from crowi/fix-single-quote-escape-in-code

Fix single quote escape in code

Gruntfile.js

@@ -60,11 +60,11 @@ module.exports = function(grunt) {
       dist: {
         files: {
           '<%= dirs.cssDest %>/<%= pkg.name %>.css': [
-            'bower_components/highlightjs/styles/default.css',
+            'bower_components/highlightjs/styles/tomorrow-night.css',
             '<%= dirs.cssDest %>/<%= pkg.name %>-main.css',
           ],
           '<%= dirs.cssDest %>/<%= pkg.name %>.min.css': [
-            'bower_components/highlightjs/styles/default.css', // TODO minimize
+            'bower_components/highlightjs/styles/tomorrow-night.css', // TODO minimize
             '<%= dirs.cssDest %>/<%= pkg.name %>-main.min.css',
           ],
           '<%= dirs.jsDest %>/<%= pkg.name %>.js': [

resource/css/_wiki.scss

@@ -1,8 +1,3 @@
-
-pre.body {
-  border: solid 1px #ccc;
-  background: #f0f0f0;
-}
 div.body {
   padding: 10px;
 }
@@ -105,6 +100,10 @@ div.body {
   pre {
     line-height: 1.4em;
     font-size: .9em;
+    border: solid 1px #333;
+    background: #444;
+    color: #f0f0f0;
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
   }
 
   img {

resource/js/crowi.js

@@ -98,6 +98,7 @@ Crowi.escape = function(s) {
   s = s.replace(/&/g, '&')
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;')
+    .replace(/'/g, '&#39;')
     .replace(/"/g, '&quot;')
     ;
   return s;
@@ -107,6 +108,7 @@ Crowi.unescape = function(s) {
     .replace(/&amp;/g, '&')
     .replace(/&lt;/g, '<')
     .replace(/&gt;/g, '>')
+    .replace(/&#39;/g, '\'')
     .replace(/&quot;/g, '"')
     ;
   return s;
@@ -126,10 +128,12 @@ Crowi.rendererType.markdown.prototype = {
         var result;
         if (lang) {
           result = hljs.highlight(lang, code);
+          return callback(null, result.value);
         } else {
-          result = hljs.highlightAuto(code);
+          //result = hljs.highlightAuto(code);
+          //callback(null, result.value);
+          return callback(null, code);
         }
-        callback(null, result.value);
       },
       tables: true,
       breaks: true,