Merge remote-tracking branch 'origin/master' into readme-box

Conflicts:
	web/js/main.js
This commit is contained in:
Michał Prochowski
2012-06-14 00:40:44 +02:00
10 changed files with 20 additions and 19 deletions

View File

@@ -1,17 +1,18 @@
$(function () {
$('.dropdown-toggle').dropdown();
var mode = $('#sourcecode').attr('language');
CodeMirror.fromTextArea(document.getElementById("sourcecode"), {
lineNumbers: true,
matchBrackets: true,
lineWrapping: true,
readOnly: true,
mode: mode
});
});
if ($('#sourcecode').length) {
var mode = $('#sourcecode').attr('language');
CodeMirror.fromTextArea(document.getElementById("sourcecode"), {
lineNumbers: true,
matchBrackets: true,
lineWrapping: true,
readOnly: true,
mode: mode
});
};
if ($('#readme-content').length) {
if ($('#readme-content').length) {
var converter = new Showdown.converter();
$('#readme-content').html(converter.makeHtml($('#readme-content').text()));
}