Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / wmd.pm

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 3372ffe38dc35c115829eceba24e06d165045e4b..9ddd237abf7e992f0e0d2dfdfa3daf3ed1c59baa 100644 (file)
--- 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