Permalink
Browse files

Merge pull request #374 from KrissiK/master

Added support for markdown tables
  • Loading branch information...
2 parents 5fd33a9 + 3b2fd41 commit e9a21f77c63a88d89aec8f38aacff2fd316d6b98 @klaussilveira committed Sep 17, 2013
Showing with 1,504 additions and 18 deletions.
  1. +1 −0 views/layout.twig
  2. +1 −1 web/js/main.js
  3. +1,396 −17 web/js/showdown.js
  4. +106 −0 web/js/table.js
View
@@ -17,6 +17,7 @@
<script src="{{ app.request.basepath }}/web/js/bootstrap.js"></script>
<script src="{{ app.request.basepath }}/web/js/codemirror.js"></script>
<script src="{{ app.request.basepath }}/web/js/showdown.js"></script>
+ <script src="{{ app.request.basepath }}/web/js/table.js"></script>
<script src="{{ app.request.basepath }}/web/js/main.js"></script>
<script src="{{ app.request.basepath }}/web/js/networkGraph.js"></script>
</body>
View
@@ -21,7 +21,7 @@ $(function () {
}
if ($('#md-content').length) {
- var converter = new Showdown.converter();
+ var converter = new Showdown.converter({extensions: ['table']});
$('#md-content').html(converter.makeHtml($('#md-content').text()));
}
Oops, something went wrong.

0 comments on commit e9a21f7

Please sign in to comment.