Skip to content

Commit

Permalink
Better class name detection for plugins (#1772)
Browse files Browse the repository at this point in the history
This improves the class name regex of a few plugins to avoid false positives.
  • Loading branch information
RunDevelopment committed Mar 6, 2019
1 parent a2d445d commit c9762c6
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions plugins/line-numbers/prism-line-numbers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @type {String}
*/
var PLUGIN_NAME = 'line-numbers';

/**
* Regular expression used for determining line breaks
* @type {RegExp}
Expand Down Expand Up @@ -73,7 +73,7 @@

// works only for <code> wrapped inside <pre> (not inline)
var pre = env.element.parentNode;
var clsReg = /\s*\bline-numbers\b\s*/;
var clsReg = /(?:^|\s)line-numbers(?:\s|$)/;
if (
!pre || !/pre/i.test(pre.nodeName) ||
// Abort only if nor the <pre> nor the <code> have the class
Expand Down Expand Up @@ -123,7 +123,7 @@
env.plugins = env.plugins || {};
env.plugins.lineNumbers = true;
});

/**
* Global exports
*/
Expand Down Expand Up @@ -156,4 +156,4 @@
}
};

}());
}());
2 changes: 1 addition & 1 deletion plugins/line-numbers/prism-line-numbers.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion plugins/normalize-whitespace/prism-normalize-whitespace.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Prism.hooks.add('before-sanity-check', function (env) {

// Normal mode
var pre = env.element.parentNode;
var clsReg = /\bno-whitespace-normalization\b/;
var clsReg = /(?:^|\s)no-whitespace-normalization(?:\s|$)/;
if (!env.code || !pre || pre.nodeName.toLowerCase() !== 'pre' ||
clsReg.test(pre.className) || clsReg.test(env.element.className))
return;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if (typeof self === 'undefined' || !self.Prism || !self.document) {
Prism.hooks.add('before-sanity-check', function (env) {
if (env.code) {
var pre = env.element.parentNode;
var clsReg = /\s*\bkeep-initial-line-feed\b\s*/;
var clsReg = /(?:^|\s)keep-initial-line-feed(?:\s|$)/;
if (
pre && pre.nodeName.toLowerCase() === 'pre' &&
// Apply only if nor the <pre> or the <code> have the class
Expand All @@ -18,4 +18,4 @@ Prism.hooks.add('before-sanity-check', function (env) {
}
});

}());
}());

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c9762c6

Please sign in to comment.