Skip to content
Open
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
17 changes: 10 additions & 7 deletions jquery.highlight.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jQuery.fn.unhighlight = function (options) {
};

jQuery.fn.highlight = function (words, options) {
var settings = { className: 'highlight', element: 'span', caseSensitive: false, wordsOnly: false };
var settings = { className: 'highlight', element: 'span', caseSensitive: false, wordsOnly: false, pattern: undefined };
jQuery.extend(settings, options);

if (words.constructor === String) {
Expand All @@ -95,14 +95,17 @@ jQuery.fn.highlight = function (words, options) {
if (words.length == 0) { return this; };

var flag = settings.caseSensitive ? "" : "i";
var pattern = "(" + words.join("|") + ")";
if (settings.wordsOnly) {
pattern = "\\b" + pattern + "\\b";
var re;
if (settings.pattern) {
re = new RegExp(settings.pattern, flag);
} else {
var pattern = "(" + words.join("|") + ")";
if (settings.wordsOnly) {
pattern = "\\b" + pattern + "\\b";
}
re = new RegExp(pattern, flag);
}
var re = new RegExp(pattern, flag);

return this.each(function () {
jQuery.highlight(this, re, settings.element, settings.className);
});
};