From 723437651d91a5ceb85b804b53e465bce732dc49 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 12 Feb 2023 17:57:53 +0300 Subject: [PATCH] bugfix... Signed-off-by: Alex A. Naanou --- pwiki/page.js | 4 ---- pwiki/parser.js | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pwiki/page.js b/pwiki/page.js index f2d34e9..6c269ed 100755 --- a/pwiki/page.js +++ b/pwiki/page.js @@ -2014,10 +2014,6 @@ object.Constructor('Page', BasePage, { // XXX EXPERIMENTAL // XXX would be nice to be able to chain .awaitOrRun(..) calls instead // of nesting them like here... - // XXX BUG: this breaks on: - // pwiki = reqiter('./pwiki-test').pwiki - // await pwiki.get('./_text').text - // ...seems to break the original vetsion too... get text(){ var that = this return Promise.awaitOrRun( diff --git a/pwiki/parser.js b/pwiki/parser.js index 4977285..fbf9ce6 100755 --- a/pwiki/parser.js +++ b/pwiki/parser.js @@ -621,8 +621,9 @@ module.BaseParser = { return that.resolve(page, e, state) // data -- unwrap content... } else if(e instanceof Object && 'data' in e){ - return that.resolve(page, e.data, state) - .then(function(e){ + return Promise.awaitOrRun( + that.resolve(page, e.data, state), + function(e){ return { data: e } }) // skipped items... } else if(e instanceof Object && e.skip){