Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tested and seems to work
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
toggle.pm
diff --git
a/IkiWiki/Plugin/toggle.pm
b/IkiWiki/Plugin/toggle.pm
index 3319421d923d56c3489b7374edb912be7493027b..af4d2ba3a858774ac6b77be58479fb2a4a18d69c 100644
(file)
--- a/
IkiWiki/Plugin/toggle.pm
+++ b/
IkiWiki/Plugin/toggle.pm
@@
-50,8
+50,7
@@
sub preprocess_toggleable (@) {
# Preprocess the text to expand any preprocessor directives
# embedded inside it.
# Preprocess the text to expand any preprocessor directives
# embedded inside it.
- $params{text}=IkiWiki::preprocess($params{page}, $params{destpage},
- IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
+ $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
my $id=genid($params{page}, $params{id});
my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
my $id=genid($params{page}, $params{id});
my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
@@
-70,20
+69,19
@@
sub format (@) {
if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
$params{content}=~s/<div class="toggleableend">//g;
if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
$params{content}=~s/<div class="toggleableend">//g;
if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
- # no <
/
body> tag, probably in preview mode
- $params{content}=include_javascript(
$params{page}, 1
).$params{content};
+ # no <body> tag, probably in preview mode
+ $params{content}=include_javascript(
undef
).$params{content};
}
}
return $params{content};
}
}
}
return $params{content};
}
-sub include_javascript ($;$) {
- my $page=shift;
- my $absolute=shift;
+sub include_javascript ($) {
+ my $from=shift;
- return '<script src="'.urlto("ikiwiki/ikiwiki.js", $
page, $absolute
).
+ return '<script src="'.urlto("ikiwiki/ikiwiki.js", $
from
).
'" type="text/javascript" charset="utf-8"></script>'."\n".
'" type="text/javascript" charset="utf-8"></script>'."\n".
- '<script src="'.urlto("ikiwiki/toggle.js", $
page, $absolute
).
+ '<script src="'.urlto("ikiwiki/toggle.js", $
from
).
'" type="text/javascript" charset="utf-8"></script>';
}
'" type="text/javascript" charset="utf-8"></script>';
}