Commiteac15d9

authored

Merge pull request#7765 from HughJacks/fix-fes-error

Fixed Error in FES prevents message from being shown, Prevented 'window' properties from being overwritten

2 parents4ca88f3 +a5f0be6 commiteac15d9Copy full SHA for eac15d9

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ function fesCore(p5, fn){`
`348`	`348`	`// actual name with correct capitalization doesnt exist in context,`
`349`	`349`	`// and if the user-defined symbol is of the type function`
`350`	`350`	`if(`
`351`		`-fxns[lowercase]&&`
	`351`	`+fxns.hasOwnProperty(lowercase)&&`
`352`	`352`	`!context[fxns[lowercase]]&&`
`353`	`353`	`typeofcontext[prop]==='function'`
`354`	`354`	`){`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,11 @@ class p5 {`
`137`	`137`	`bindGlobal(p);`
`138`	`138`	`}`
`139`	`139`
	`140`	`+constprotectedProperties=['constructor','length'];`
`140`	`141`	`// Attach its properties to the window`
`141`	`142`	`for(constpinthis){`
`142`	`143`	`if(this.hasOwnProperty(p)){`
`143`		`-if(p[0]==='_')continue;`
	`144`	`+if(p[0]==='_'\|\|protectedProperties.includes(p))continue;`
`144`	`145`	`bindGlobal(p);`
`145`	`146`	`}`
`146`	`147`	`}`

Comments

(0)