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

macros almost done...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-09-28 18:48:09 +03:00
parent 34b93885b0
commit dedff41f61
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macro.js
View File

@ -595,19 +595,19 @@ module = {
var isolated = elem.attr('isolated') == 'true' var isolated = elem.attr('isolated') == 'true'
var seen = state.seen.slice() var seen = state.seen.slice()
if(seen.indexOf(page.path) >= 0){ if(seen.indexOf(page.path()) >= 0){
return elem.html() return elem.html()
} }
seen.push(page.path) seen.push(page.path())
return page.map(function(page){ return page.map(function(page){
return $('<div>') return $('<div>')
.append(elem .append(elem
.clone() .clone()
.attr('src', page.path) .attr('src', page.path())
.append(that .append(that
.parse(page, .parse(page,
page.raw, page.raw(),
{ {
//slots: !isolated ? state.slots : {}, //slots: !isolated ? state.slots : {},
templates: state.templates, templates: state.templates,

7
pwiki.js
View File

@ -1122,9 +1122,14 @@ module._test = function(){
var wiki = Object.create(pWikiData) var wiki = Object.create(pWikiData)
wiki.__data = Object.create(module._test_data) wiki.__data = Object.create(module._test_data)
return new pWikiPage({ var page = new pWikiPage({
wiki: wiki, wiki: wiki,
}) })
// XXX do some testing...
// XXX
return page
} }