remove local version of marked.js, prefer bower version

2016-02-15 11:49:47 +01:00
parent 587f95b6d7
commit afa2811472
3 changed files with 3 additions and 1268 deletions
--- a/bower.json
+++ b/bower.json
@@ -26,6 +26,7 @@
    "requirejs": "~2.1.15",
    "modalBox": "~1.0.2",
    "reconnectingWebsocket": "",
-    "diff-dom": "~2.0.0"
+    "diff-dom": "~2.0.0",
+    "marked": "~0.3.5"
  }
 }
--- a/www/common/marked.js
+++ b/www/common/marked.js
--- a/www/render/main.js
+++ b/www/render/main.js
@@ -3,7 +3,7 @@ define([
    '/common/realtime-input.js',
    '/common/messages.js',
    '/common/crypto.js',
-    '/common/marked.js',
+    '/bower_components/marked/marked.min.js',
    '/common/convert.js',
    '/common/rainbow.js',
    '/bower_components/jquery/dist/jquery.min.js',