Skip to content

Fix #12 Its not possible to have NO cssPrefix. #17

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

Open
phatpaul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #12 Its not possible to have NO cssPrefix. #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,25 @@ module.exports = function (options) {
options = options || {};

// Init default options
if (!options.fileName) {
if (options.fileName == null) { // == null is true for null and undefined, but not empty string.
options.fileName = 'icons';
}
if (!options.cssPrefix) {
if (options.cssPrefix == null) {
options.cssPrefix = 'icon-';
}
if (!options.cssSelector) {
if (options.cssSelector == null) {
options.cssSelector = '.';
}
if (!options.addSize) {
options.addSize = false;
}
if (!options.defaultWidth) {
if (!options.defaultWidth) { // empty string not allowed
options.defaultWidth = '16px';
}
if (!options.defaultHeight) {
if (!options.defaultHeight) { // empty string not allowed
options.defaultHeight = '16px';
}
if (!options.fileExt) {
if (options.fileExt == null) {
options.fileExt = 'css';
}

Expand All @@ -61,7 +61,7 @@ module.exports = function (options) {
.replace(/</gmi, '%3C') // <
.replace(/>/gmi, '%3E') // >
.replace(/#/gmi, '%23') // #
.replace(/\"/gmi, '\''); // "
.replace(/\"/gmi, '\''); // " (replace double-quotes with single-quotes)
}

/**
Expand All @@ -75,7 +75,7 @@ module.exports = function (options) {
function buildCssRule(normalizedFileName, encodedSvg, width, height) {
var cssRule = [];
cssRule.push(options.cssSelector + options.cssPrefix + normalizedFileName + ' {');
cssRule.push(' background-image: url("data:image/svg+xml;charset=utf8, ' + encodedSvg + '");');
cssRule.push(' background-image: url("data:image/svg+xml,' + encodedSvg + '");');
if (options.addSize) {
cssRule.push(' width: ' + width + ';');
cssRule.push(' height: ' + height + ';');
Expand Down