simplify

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

diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm
index 074e1df6fc7c487ae888eda4f1e1fd8711d0c695..134cfb9101b51d48bbabc6a47b7aaba1b73ff699 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 POSIX;
-use Encode;
 
 sub import {
        add_underlay("wmd");
@@ -17,7 +15,8 @@ sub getsetup () {
        return
                plugin => {
                        safe => 1,
-                       rebuild => 1,
+                       rebuild => 0,
+                       section => "web",
                },
 }
 
@@ -27,19 +26,26 @@ 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));
+       $form->tmpl_param("wmd_preview", "<div class=\"wmd-preview\"></div>\n".
+               include_javascript(undef));
 }
 
-sub include_javascript ($;$) {
-       my $page=shift;
-       my $absolute=shift;
-       
-       return '<script src="'.urlto("wmd.js", $page, $absolute).
-               '" type="text/javascript"></script>'."\n";
+sub include_javascript ($) {
+       my $from=shift;
+
+       my $wmdjs=urlto("wmd/wmd.js", $from);
+       return <<"EOF"
+<script type="text/javascript">
+wmd_options = {
+       output: "Markdown"
+};
+</script>
+<script src="$wmdjs" type="text/javascript"></script>
+EOF
 }
 
 1
-