Fix escaping of filenames in historyurl. (Thanks, aj)

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

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 3372ffe38dc35c115829eceba24e06d165045e4b..71d7c9d17f51e49ec17aee087e984f3e8a7b9b79 100644 (file)
--- a/IkiWiki/Plugin/wmd.pm
+++ b/IkiWiki/Plugin/wmd.pm
@@ -4,8 +4,6 @@ package IkiWiki::Plugin::wmd;
 use warnings;
 use strict;
 use IkiWiki 3.00;
 use warnings;
 use strict;
 use IkiWiki 3.00;

-use POSIX;
-use Encode;

 
 sub import {
        add_underlay("wmd");
 
 sub import {
        add_underlay("wmd");


@@ -17,6 +15,8 @@ sub getsetup () {
        return
                plugin => {
                        safe => 1,
        return
                plugin => {
                        safe => 1,

+                       rebuild => 0,
+                       section => "web",

                },
 }
 
                },
 }
 


@@ -26,8 +26,9 @@ sub formbuilder_setup (@) {
 
        return if ! defined $form->field("do");
        
 
        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));
 
        $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;
 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
 }
 
 1