Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
*.min.*
src/lib/markbind/src/lib/markdown-it/*
src/lib/markbind/src/lib/vue-attribute-renderer/*
src/lib/markbind/src/lib/markdown-it-shared/*

!.eslintrc.js
2 changes: 1 addition & 1 deletion docs/userGuide/syntax/boxes.mbdf
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<box type="info" dismissible>
dismissible info
</box>
<box type="success" header="#### Header :rocket:" icon-size="2x">
<box type="success" header="#### Header :rocket: { .no-index }" icon-size="2x">
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
<box type="warning" header="You can use **markdown** here! :pizza:" dismissible>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Expand Down
7 changes: 7 additions & 0 deletions docs/userGuide/syntax/footnotes.mbdf
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ note.]
</include>
</span>

<box type="warning">

Normal footnotes won't work when used inside the attributes of markbind components!
<br>
For example, it won't work in the `header` attribute of [panels](../usingComponents.html#panels).
</box>

<span id="short" class="d-none">

```html
Expand Down
10 changes: 5 additions & 5 deletions docs/userGuide/syntax/textStyles.mbdf
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ Syntax added by MarkBind:
<span id="code">

```markdown
****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%
****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%, Super^script^, Sub~script~
```
</span>
<span id="output">

****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%
****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%, Super^script^, Sub~script~

</span>
</include>
Expand All @@ -57,11 +57,11 @@ Syntax added by MarkBind:
<span id="short" class="d-none">
```markdown
**Bold**, _Italic_, ___Bold and Italic___, `Inline Code`
~~Strike through~~, ****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%
~~Strike through~~, ****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%, Super^script^, Sub~script~
```
</span>
<span id="examples" class="d-none">

**Bold**, _Italic_, ___Bold and Italic___, `Inline Code`
~~Strike through~~, ****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%
</span>
~~Strike through~~, ****Super Bold****, ++Underline++, ==Highlight==, %%Dim%%, Super^script^, Sub~script~
</span>
2 changes: 1 addition & 1 deletion src/Site.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const walkSync = require('walk-sync');
const MarkBind = require('./lib/markbind/src/parser');
const injectHtmlParser2SpecialTags = require('./lib/markbind/src/patches/htmlparser2');
const injectMarkdownItSpecialTags = require(
'./lib/markbind/src/lib/markdown-it-shared/markdown-it-escape-special-tags');
'./lib/markbind/src/lib/markdown-it/markdown-it-escape-special-tags');

const _ = {};
_.difference = require('lodash/difference');
Expand Down
8 changes: 5 additions & 3 deletions src/lib/markbind/src/lib/markdown-it/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ const slugify = require('@sindresorhus/slugify');
// markdown-it plugins
markdownIt.use(require('markdown-it-mark'))
.use(require('markdown-it-ins'))
.use(require('markdown-it-sub'))
.use(require('markdown-it-sup'))
.use(require('markdown-it-imsize'), {autofill: false})
.use(require('markdown-it-table-of-contents'))
.use(require('markdown-it-task-lists'), {enabled: true})
.use(require('markdown-it-linkify-images'), {imgClass: 'img-fluid'})
.use(require('markdown-it-attrs'))
.use(require('../markdown-it-shared/markdown-it-dimmed'))
.use(require('./markdown-it-dimmed'))
.use(require('./markdown-it-radio-button'))
.use(require('./markdown-it-block-embed'))
.use(require('../markdown-it-shared/markdown-it-icons'))
.use(require('./markdown-it-icons'))
.use(require('./markdown-it-footnotes'));

// fix link
Expand Down Expand Up @@ -134,7 +136,7 @@ markdownIt.renderer.rules.code_inline = (tokens, idx, options, env, slf) => {
}
};

const fixedNumberEmojiDefs = require('../markdown-it-shared/markdown-it-emoji-fixed');
const fixedNumberEmojiDefs = require('./markdown-it-emoji-fixed');
markdownIt.use(require('markdown-it-emoji'), {
defs: fixedNumberEmojiDefs
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const markdownIt = require('../markdown-it');
const markdownIt = require('./index');

/*
Custom patch for the api to escape content in certain special tags
Expand Down
28 changes: 0 additions & 28 deletions src/lib/markbind/src/lib/vue-attribute-renderer/index.js

This file was deleted.

6 changes: 3 additions & 3 deletions src/lib/markbind/src/parsers/componentParser.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const cheerio = require('cheerio');
const _ = {};
_.has = require('lodash/has');

const vueAttrRenderer = require('../lib/vue-attribute-renderer');
const md = require('../lib/markdown-it');

cheerio.prototype.options.xmlMode = true; // Enable xml mode for self-closing tag
cheerio.prototype.options.decodeEntities = false; // Don't escape HTML entities
Expand All @@ -27,9 +27,9 @@ function _parseAttributeWithoutOverride(node, attribute, isInline, slotName = at
if (!hasAttributeSlot && _.has(node.attribs, attribute)) {
let rendered;
if (isInline) {
rendered = vueAttrRenderer.renderInline(node.attribs[attribute]);
rendered = md.renderInline(node.attribs[attribute]);
} else {
rendered = vueAttrRenderer.render(node.attribs[attribute]);
rendered = md.render(node.attribs[attribute]);
}

const attributeSlotElement = cheerio.parseHTML(
Expand Down
2 changes: 1 addition & 1 deletion test/unit/markdown-it-icons.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const expectedOcticon = require('@primer/octicons')['git-pull-request'].toSVG();

const markdownIt = require('markdown-it')()
.use(require('../../src/lib/markbind/src/lib/markdown-it-shared/markdown-it-icons'));
.use(require('../../src/lib/markbind/src/lib/markdown-it/markdown-it-icons'));

test('markdown-it-icons renders icon syntax correctly', () => {
const source = ':fab-font-awesome: :glyphicon-home: :octicon-git-pull-request:';
Expand Down