From e3b104f9ccde5e48ad06ed59f3af4a5821fe0caf Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 30 Oct 2022 16:57:27 +0300 Subject: [PATCH] reasonable defaults for macros... Signed-off-by: Alex A. Naanou --- pwiki/page.js | 4 +--- pwiki2.js | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pwiki/page.js b/pwiki/page.js index 9456c7a..6538b53 100755 --- a/pwiki/page.js +++ b/pwiki/page.js @@ -1400,12 +1400,11 @@ object.Constructor('Page', BasePage, { args.isolated : iargs.isolated) ?? true - // XXX INHERITMACROS EXPERIMENTAL var inheritmacros = ('inheritmacros' in args ? args.inheritmacros : iargs.inheritmacros) - ?? false + ?? true if(src){ src = await base.parse(src, state) @@ -1442,7 +1441,6 @@ object.Constructor('Page', BasePage, { seen: state.seen, depends, renderer: state.renderer, - // XXX INHERITMACROS EXPERIMENTAL macros: args.inheritmacros ? {__proto__: macros} : {}, diff --git a/pwiki2.js b/pwiki2.js index 1ead4b5..b4c732b 100755 --- a/pwiki2.js +++ b/pwiki2.js @@ -24,7 +24,6 @@ * This will not: * await pwiki.parse('@source(.)') * XXX Q: do we need a way to index a list item via path??? -* XXX macro: should inheritmacros be true or false (current) by default??? * XXX STYLE: should style loading be done via the event mechanics * (see: pwiki2.html) or via the base templates (see: pwiki/page.js:_view * template)???