flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2025-12-18 17:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed list/generator macro rendering...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-10-26 20:50:18 +03:00
parent 01e59af5a1
commit 8a209dfa96
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pwiki/page.js
View File

@ -862,7 +862,7 @@ object.Constructor('Page', BasePage, {
: v : v
return v return v
|| args.default }), || args.default }),
'': Macro( '': Macro(
['name', 'default', ['local']], ['name', 'default', ['local']],
function(args){ function(args){
return this.macros.arg.call(this, args) }), return this.macros.arg.call(this, args) }),
@ -983,7 +983,8 @@ object.Constructor('Page', BasePage, {
handler = handler handler = handler
?? async function(src, state){ ?? async function(src, state){
return isolated ? return isolated ?
{data: await this.get(src) //{data: await this.get(src)
{data: await this
.parse({ .parse({
seen: state.seen, seen: state.seen,
depends, depends,
@ -1063,7 +1064,8 @@ object.Constructor('Page', BasePage, {
'source', 'source',
args, body, state, 'sources', args, body, state, 'sources',
async function(src, state){ async function(src, state){
return that.parse(that.get(src).raw, state) }) }), //return that.parse(that.get(src).raw, state) }) }),
return that.parse(this.raw, state) }) }),
// //
// @quote(<src>) // @quote(<src>)
// //

3
pwiki2.js
View File

@ -23,6 +23,9 @@
* should be: * should be:
* await pwiki.parse('@source(/Test/list/static join=", ")') * await pwiki.parse('@source(/Test/list/static join=", ")')
* -> 'a, b, c, d, e, f' * -> 'a, b, c, d, e, f'
* findings:
* - this is a problem with @source(..) while @include(..) works fine...
* FIXED, TESTING...
* XXX TAGS should ./tags (i.e. .tagstr) return a list of tags??? * XXX TAGS should ./tags (i.e. .tagstr) return a list of tags???
* XXX TAGS * XXX TAGS
* - add tags to page -- macro/filter * - add tags to page -- macro/filter