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

bugfix...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-12-02 03:19:16 +03:00
parent fd82fc26a6
commit 7a86d47230
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pwiki/page.js
View File

@ -1673,6 +1673,7 @@ object.Constructor('Page', BasePage, {
'!': true,
// XXX EXPERIMENTAL...
quote: true,
'quote!': true,
},
// XXX should this be .raw or .parse()???
@ -1684,12 +1685,16 @@ object.Constructor('Page', BasePage, {
// XXX this is html/web specific, should it be here???
// ...
// XXX should this be .raw or .parse()???
quote: function(){
return this.get('..:$ARGS').raw//parse()
quote: async function(energetic=false){
return this.get('..:$ARGS', {energetic: await this.energetic}).raw//parse()
.then(function(res){
return res instanceof Array ?
res.map(pwpath.quoteHTML)
: pwpath.quoteHTML(res) }) },
'quote!': Object.assign(
function(){
return this.quote(true) },
{energetic: true}),
// events...
@ -2182,7 +2187,7 @@ module.System = {
<a href="#/list">&#9776</a>
<a href="#<slot parent>../</slot>">&#x21D1;</a>
<!-- XXX make this editable... -->
[<slot location>@source(./location/!/quote)</slot>]
[<slot location>@source(./location/quote/!)</slot>]
<a href="javascript:refresh()">&#10227;</a>
<slot edit>
<a href="#@source(s ./path/!)/edit">&#9998;</a>
@ -2196,7 +2201,7 @@ module.System = {
<!-- NOTE: this is not included directly to enable client code to
set slots that are defined after the content... -->
<slot content>
<h1><slot title>@source(./title/!/quote)</slot></h1>
<h1><slot title>@source(./title/quote/!)</slot></h1>
@include(.:$ARGS join="@source(file-separator)" recursive="")
</slot>
` },
@ -2228,7 +2233,7 @@ module.System = {
/*/
_edit: {
text:
'@source(./path/!/quote)'
'@source(./path/quote/!)'
+'<hr>'
+'<macro src="." join="@source(file-separator)">'
+'<h1 '
@ -2274,7 +2279,7 @@ module.System = {
<title>@source(../title) (edit)</title>
</slot>
<slot parent>../..</slot>
<slot location>@source(../location/!/quote)</slot>
<slot location>@source(../location/quote/!)</slot>
<slot edit/>
<slot content>
<macro editor src=".."/>

3
pwiki2.js
View File

@ -38,6 +38,7 @@
*
*
*
* XXX BUG: for some reason editing the root page ('/') hangs /tree...
* XXX .parse(..): should we handle pattern paths and lists of text???
* XXX parser: error handling: add line number + context... (???)
* XXX BUG: parser:
@ -438,6 +439,8 @@
*
*
* XXX DOC:
* - .../quote/! is not the same as .../!/quote
* this is because actions are called right to left...
* - macro isolation in relation to slots...
* - paths in pWiki behave a bit differently than traditional
* file-system paths, this is due to one key distinction: