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

tweaking...

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.js vendored
View File

File diff suppressed because one or more lines are too long

15
bootstrap/Doc/Macros.md
View File

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

7
wiki.js
View File

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