Skip to content

Commit

Permalink
Merge pull request #774 from cure53/main
Browse files Browse the repository at this point in the history
Merging latest from main into 3.x
  • Loading branch information
cure53 authored Feb 26, 2023
2 parents 5dcf2a0 + 967b8da commit 429d665
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ name: Build and Test
on:
push:
branches:
- main
- 3.x
pull_request:

Expand Down
1 change: 1 addition & 0 deletions dist/purify.cjs.js

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

2 changes: 1 addition & 1 deletion dist/purify.cjs.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/purify.es.js

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

2 changes: 1 addition & 1 deletion dist/purify.es.js.map

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/purify.js

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

2 changes: 1 addition & 1 deletion dist/purify.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/purify.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/purify.min.js.map

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/purify.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ function createDOMPurify(window = getGlobal()) {
* @property {RegExp|Function|null} attributeNameCheck one of [null, regexPattern, predicate]. Default: `null` (disallow any attributes not on the allow list)
* @property {boolean} allowCustomizedBuiltInElements allow custom elements derived from built-ins if they pass CUSTOM_ELEMENT_HANDLING.tagNameCheck. Default: `false`.
*/
const CUSTOM_ELEMENT_HANDLING = Object.seal(
let CUSTOM_ELEMENT_HANDLING = Object.seal(
Object.create(null, {
tagNameCheck: {
writable: true,
Expand Down Expand Up @@ -481,6 +481,7 @@ function createDOMPurify(window = getGlobal()) {
IN_PLACE = cfg.IN_PLACE || false; // Default false
IS_ALLOWED_URI = cfg.ALLOWED_URI_REGEXP || IS_ALLOWED_URI;
NAMESPACE = cfg.NAMESPACE || HTML_NAMESPACE;
CUSTOM_ELEMENT_HANDLING = cfg.CUSTOM_ELEMENT_HANDLING || {};
if (
cfg.CUSTOM_ELEMENT_HANDLING &&
isRegexOrFunction(cfg.CUSTOM_ELEMENT_HANDLING.tagNameCheck)
Expand Down

0 comments on commit 429d665

Please sign in to comment.