flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2025-11-01 03:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-09-10 02:28:12 +03:00
parent b406ed04e8
commit f42fb181f1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pwiki/page.js
View File

@ -837,7 +837,7 @@ object.Constructor('Page', BasePage, {
// the context, this potentially can lead to false positives. // the context, this potentially can lead to false positives.
include: Macro( include: Macro(
['src', 'recursive', 'join', ['src', 'recursive', 'join',
['strict', 'nonstrict', 'isolated', 'all']], ['strict', 'nonstrict', 'isolated']],
async function*(args, body, state, key='included', handler){ async function*(args, body, state, key='included', handler){
var macro = 'include' var macro = 'include'
if(typeof(args) == 'string'){ if(typeof(args) == 'string'){
@ -926,7 +926,7 @@ object.Constructor('Page', BasePage, {
source: Macro( source: Macro(
// XXX should this have the same args as include??? // XXX should this have the same args as include???
['src', 'recursive', 'join', ['src', 'recursive', 'join',
['strict', 'nonstrict', 'isolated', 'all']], ['strict', 'nonstrict', 'isolated']],
//['src'], //['src'],
async function*(args, body, state){ async function*(args, body, state){
yield* this.macros.include.call(this, yield* this.macros.include.call(this,
@ -956,7 +956,7 @@ object.Constructor('Page', BasePage, {
// XXX need a way to escape macros -- i.e. include </quote> in a quoted text... // XXX need a way to escape macros -- i.e. include </quote> in a quoted text...
quote: Macro( quote: Macro(
['src', 'filter', 'text', 'join', ['src', 'filter', 'text', 'join',
['expandactions', 'all']], ['expandactions']],
async function*(args, body, state){ async function*(args, body, state){
var src = args.src //|| args[0] var src = args.src //|| args[0]
var base = this.get(this.path.split(/\*/).shift()) var base = this.get(this.path.split(/\*/).shift())
@ -1162,7 +1162,7 @@ object.Constructor('Page', BasePage, {
// XXX SORT sorting not implemented yet.... // XXX SORT sorting not implemented yet....
macro: Macro( macro: Macro(
['name', 'src', 'sort', 'text', 'join', 'else', ['name', 'src', 'sort', 'text', 'join', 'else',
['strict', 'nonstrict', 'all']], ['strict', 'nonstrict']],
async function*(args, body, state){ async function*(args, body, state){
var that = this var that = this
var name = args.name //?? args[0] var name = args.name //?? args[0]
@ -2095,7 +2095,6 @@ PAGES=100
for(var i=0; i<PAGES; i++){ for(var i=0; i<PAGES; i++){
Test['Subtree/Page'+i] = {text: 'page: '+i} } Test['Subtree/Page'+i] = {text: 'page: '+i} }
var Settings = var Settings =
module.Settings = { module.Settings = {
Export: { Export: {