diff --git a/pwiki/page.js b/pwiki/page.js index 8971334..1d56896 100755 --- a/pwiki/page.js +++ b/pwiki/page.js @@ -1219,6 +1219,7 @@ object.Constructor('Page', BasePage, { // macro with one exception, when used in quote, the body is // not expanded... // NOTE: the filter argument uses the same filters as @filter(..) + // NOTE: else argument implies strict mode... // // XXX need a way to escape macros -- i.e. include in a quoted text... // XXX should join/else be sub-tags??? @@ -1231,7 +1232,9 @@ object.Constructor('Page', BasePage, { var text = args.text ?? body ?? [] - var strict = args.strict ?? false + var strict = !!(args.strict + ?? args['else'] + ?? false) // parse arg values... src = src ? await base.parse(src, state) @@ -1267,7 +1270,7 @@ object.Constructor('Page', BasePage, { pages = ((!pages || pages.length == 0) && args['else']) ? - base.parse(args['else'], state) + [await base.parse(args['else'], state)] : pages // empty... if(!pages || pages.length == 0){ @@ -2442,7 +2445,7 @@ module.System = { + oninput="saveContent('@source(s ./path)/title', this.innerText)"> @source(./title/quote) @macro(src="." @@ -2454,16 +2457,17 @@ module.System = {

 					/>
- @macro(titleeditor .) - @macro(texteditor .) + @macro(titleeditor .:$ARGS) + @macro(texteditor .:$ARGS) @@ -2473,7 +2477,7 @@ module.System = { @source(../location/quote/!) - + `}, // XXX EXPERIMENTAL... ed: { @@ -2938,8 +2942,7 @@ for(var i=0; i' - }, + text: '' }, // XXX need an import button... Export: { text: '' },