Skip to content
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

Jump to bottom

Prevent setting a propery that has a getter. (mathjax/MathJax#3098) #1001

Merged
merged 2 commits into from
Sep 15, 2023
Merged

Prevent setting a propery that has a getter. (mathjax/MathJax#3098) #1001

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd03f1c
Prevent setting a propery that has a getter. (mathjax/MathJax#3098)
dpvc Sep 14, 2023
db1b6d2
Fix typos and adjust the nesting level of if statements.
dpvc Sep 15, 2023
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
25 changes: 15 additions & 10 deletions ts/components/global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,22 @@ export function isObject(x: any): boolean {
* Combine user-produced configuration with existing defaults. Values
* from src will replace those in dst.
*
* @param {any} dst The destination config object (to be merged into)
* @param {any} src The source configuration object (to replace defaul values in dst}
* @return {any} The resulting (modified) config object
* @param {any} dst The destination config object (to be merged into)
* @param {any} src The source configuration object (to replace default values in dst}
* @param {boolean} check True when combining into MathJax._ to avoid setting a property with a getter
* @return {any} The resulting (modified) config object
*/
export function combineConfig(dst: any, src: any): any {
export function combineConfig(dst: any, src: any, check: boolean = false): any {
for (const id of Object.keys(src)) {
if (id === '__esModule') continue;
if (isObject(dst[id]) && isObject(src[id]) &&
!(src[id] instanceof Promise) /* needed for IE polyfill */) {
combineConfig(dst[id], src[id]);
} else if (src[id] !== null && src[id] !== undefined && dst[id] !== src[id]) {
if (id === '__esModule' ||
dst[id] === src[id] ||
src[id] === null ||
src[id] === undefined) {
continue;
}
if (isObject(dst[id]) && isObject(src[id])) {
combineConfig(dst[id], src[id], check || id === '_');
} else if (!check || !Object.getOwnPropertyDescriptor(dst, id)?.get) {
dst[id] = src[id];
}
}
Expand All @@ -102,7 +107,7 @@ export function combineConfig(dst: any, src: any): any {
*
* @param {any} dst The destination config object (to be merged into)
* @param {string} name The id of the configuration block to modify (created if doesn't exist)
* @param {any} src The source configuration object (to replace defaul values in dst}
* @param {any} src The source configuration object (to replace default values in dst}
* @return {any} The resulting (modified) config object
*/
export function combineDefaults(dst: any, name: string, src: any): any {
Expand Down