Skip to content

Allow null overrides in options for target and className #189

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
nfrasser merged 2 commits into from
Oct 2, 2017
Merged

Allow null overrides in options for target and className #189

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c53577c
Allow null overrides in options for target and className
collingo Feb 1, 2017
9d8e2f2
Use hasOwnProperty rather than undefined checks
collingo Feb 1, 2017
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
4 changes: 2 additions & 2 deletions src/linkify/utils/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ function Options(opts) {
this.formatHref = opts.formatHref || defaults.formatHref;
this.nl2br = opts.nl2br || defaults.nl2br;
this.tagName = opts.tagName || defaults.tagName;
this.target = opts.target || defaults.target;
this.target = opts.target !== undefined ? opts.target : defaults.target;
Copy link
Owner

@nfrasser nfrasser Feb 1, 2017

Choose a reason for hiding this comment

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

What do you think about using hasOwnProperty instead of the !== undefined check?

e.g.,

this.target = opts.hasOwnProperty('target') ? opts.target : defaults.target;

this.validate = opts.validate || defaults.validate;
this.ignoreTags = [];

// linkAttributes and linkClass is deprecated
this.attributes = opts.attributes || opts.linkAttributes || defaults.attributes;
this.className = opts.className || opts.linkClass || defaults.className;
this.className = opts.className !== undefined ? opts.className : (opts.linkClass || defaults.className);

// Make all tags names upper case

Expand Down
23 changes: 23 additions & 0 deletions test/spec/linkify/utils/options-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,27 @@ describe('linkify/utils/options', () => {
});
});
});

describe('Nullifying Options', () => {
var opts;

beforeEach(() => {
opts = new Options({
target: null,
className: null
});
});

describe('target', () => {
it('should be nulled', () => {
expect(opts.target).to.be.null;
});
});

describe('className', () => {
it('should be nulled', () => {
expect(opts.className).to.be.null;
});
});
});
});