diff options
author | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
commit | f4a1732b0e65ea4459098e4e852dff10a5af9320 (patch) | |
tree | 60b8cf4b1677504cb86f301bb62a33cc769fafd9 /IkiWiki/Plugin/wmd.pm | |
parent | cc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964 (diff) | |
parent | 0978be7affa6222d91a0bc71ddd1e86f81fc56cd (diff) |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki/Plugin/wmd.pm')
-rw-r--r-- | IkiWiki/Plugin/wmd.pm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm index 3372ffe38..9ddd237ab 100644 --- a/IkiWiki/Plugin/wmd.pm +++ b/IkiWiki/Plugin/wmd.pm @@ -26,8 +26,9 @@ sub formbuilder_setup (@) { return if ! defined $form->field("do"); - return unless (($form->field("do") eq "edit") || - ($form->field("do") eq "create")); + return unless $form->field("do") eq "edit" || + $form->field("do") eq "create" || + $form->field("do") eq "comment"; $form->tmpl_param("wmd_preview", "<div class=\"wmd-preview\"></div>\n". include_javascript(undef, 1)); @@ -36,9 +37,16 @@ sub formbuilder_setup (@) { sub include_javascript ($;$) { my $page=shift; my $absolute=shift; - - return '<script src="'.urlto("wmd.js", $page, $absolute). - '" type="text/javascript"></script>'."\n"; + + my $wmdjs=urlto("wmd/wmd.js", $page, $absolute); + return <<"EOF" +<script type="text/javascript"> +wmd_options = { + output: "Markdown" +}; +</script> +<script src="$wmdjs" type="text/javascript"></script> +EOF } 1 |