tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-08-20 01:14:11 +03:00
parent 9f95176ad1
commit 138322e0c0
3 changed files with 15 additions and 9 deletions

2
bootstrap.js vendored

File diff suppressed because one or more lines are too long

View File

@ -163,7 +163,8 @@ Arguments:
<pwiki-comment>
- [bootstrap css](bootstrap/Templates/_css.html)
</pwiki-comment> <!--[pWiki[
</pwiki-comment>
<!--[pWiki[
[Templates/\_css] / [bootstrap css](bootstrap/Templates/_css.html):
```
@source(Templates/_css)
@ -181,9 +182,10 @@ Each new occurrence of a name will change slot content.
**Example:**
<pwiki-comment>
- [bootstrap view](bootstrap/Templates/_view.html):
- [bootstrap edit](bootstrap/Templates/_edit.html):
</pwiki-comment> <!--[pWiki[
- [bootstrap view](bootstrap/Templates/_view.html)
- [bootstrap edit](bootstrap/Templates/_edit.html)
</pwiki-comment>
<!--[pWiki[
[Templates/\_view] / [bootstrap view](bootstrap/Templates/_view.html):
```
@source(Templates/_view)
@ -226,12 +228,13 @@ of `macro` matches no pages.
<pwiki-comment>
- [bootstrap pages](bootstrap/Templates/pages.html):
</pwiki-comment> <!--[pWiki[
</pwiki-comment>
<!-- [pWiki[
[Templates/pages] / [bootstrap pages](bootstrap/Templates/pages.html):
```
@source(Templates/pages)
```
]]-->
]] -->
<!-- @filter(markdown) -->

View File

@ -579,8 +579,11 @@ var macro = {
// conditional comment...
if(e.nodeType == e.COMMENT_NODE
&& /^<!--\[pWiki\[(.|\n)*\]\]-->$/.test(text)){
text = text.slice(11, -5)
&& /^<!--\s*\[pWiki\[(.|\n)*\]\]\s*-->$/.test(text)){
text = text
.replace(/^<!--\s*\[pWiki\[/, '')
.replace(/\]\]\s*-->$/, '')
console.log('!!!!', text)
}
$(e).replaceWith(_parseText(context, text, macro))