mirror of
https://github.com/flynx/pWiki.git
synced 2026-07-13 20:10:57 +00:00
resoled conflict...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
commit
0acb5a223a
@ -1429,7 +1429,13 @@ module.parser = {
|
|||||||
var pageHandler =
|
var pageHandler =
|
||||||
function(text, i, l){
|
function(text, i, l){
|
||||||
return [
|
return [
|
||||||
handler.call(that, parser, text, state),
|
handler.call(that,
|
||||||
|
parser,
|
||||||
|
text,
|
||||||
|
args.isolated ?
|
||||||
|
// XXX clean (now), partial or derp-copy?
|
||||||
|
{}
|
||||||
|
: state),
|
||||||
// join...
|
// join...
|
||||||
(args.join
|
(args.join
|
||||||
&& i < l.length - 1) ?
|
&& i < l.length - 1) ?
|
||||||
@ -2022,4 +2028,4 @@ module.P = {
|
|||||||
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* vim:set ts=4 sw=4 : */ return module })
|
* vim:set ts=4 sw=4 nowrap : */ return module })
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user