Skip to content

Incorrect octicon name crashes live preview #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ang-zeyu merged 5 commits into from
Oct 24, 2020
Merged

Incorrect octicon name crashes live preview #1377

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d271748
add existence check for octicons
KendrickAng Oct 18, 2020
f5ab749
Revert "add existence check for octicons"
KendrickAng Oct 19, 2020
c5129d7
add existence check for octicons
KendrickAng Oct 19, 2020
9e48ade
refactor logic based on comments
KendrickAng Oct 20, 2020
c5d121f
fix incorrect logic
KendrickAng Oct 22, 2020
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
18 changes: 14 additions & 4 deletions packages/core/src/lib/markdown-it/markdown-it-icons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,21 @@ module.exports = require('markdown-it-regexp')(
if (iconFontType === 'glyphicon') {
return `<span aria-hidden="true" class="glyphicon glyphicon-${iconFontName}"></span>`;
} else if (iconFontType === 'octicon') {
return iconClass ? octicons[iconFontName].toSVG({"class": iconClass})
: octicons[iconFontName].toSVG();
// ensure octicons are valid
if (!octicons.hasOwnProperty(iconFontName)) {

@ang-zeyu ang-zeyu Oct 22, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be above octicons[iconFontName]? 😮

@KendrickAng KendrickAng Oct 22, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it shouldn't ... so sorry about that 😓

@KendrickAng KendrickAng Oct 22, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

corrected!

return `<span aria-hidden="true"></span>`;
}
return iconClass
? octicons[iconFontName].toSVG({"class": iconClass})
: octicons[iconFontName].toSVG();
} else if (iconFontType === 'octiconlight') {
return iconClass ? octicons[iconFontName].toSVG({"style": "color: #fff;", "class": iconClass})
: octicons[iconFontName].toSVG({"style": "color: #fff;"});
// ensure octicons are valid
if (!octicons.hasOwnProperty(iconFontName)) {
return `<span aria-hidden="true"></span>`;
}
return iconClass
? octicons[iconFontName].toSVG({"style": "color: #fff;", "class": iconClass})
: octicons[iconFontName].toSVG({"style": "color: #fff;"});
} else { // If icon is a Font Awesome icon
return `<span aria-hidden="true" class="${iconFontType} fa-${iconFontName}"></span>`;
}
Expand Down