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.

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

Initialize script context in DidClearWindowObject #5768

Merged
merged 2 commits into from May 30, 2016

Conversation

Projects
None yet
3 participants
@zcbenz
Contributor

zcbenz commented May 30, 2016

Doing it in RunScriptsAtDocumentStart would somehow result in weird results when webSecurity is off.

Close #5712.
Close #5721.
Close #5727.

zcbenz added some commits May 30, 2016

Initialize script context in DidClearWindowObject
Doing it in RunScriptsAtDocumentStart would somehow result in weird
results when webSecurity is off.

@zcbenz zcbenz merged commit 6e14a55 into master May 30, 2016

8 of 9 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
electron-linux-arm Build #3327996 succeeded in 42s
Details
electron-linux-ia32 Build #3327997 succeeded in 34s
Details
electron-linux-x64 Build #3327998 succeeded in 116s
Details
electron-mas-x64 Build #1350 succeeded in 5 min 33 sec
Details
electron-osx-x64 Build #1353 succeeded in 6 min 30 sec
Details
electron-win-ia32 Build #355 succeeded in 6 min 24 sec
Details
electron-win-x64 Build #350 succeeded in 6 min 24 sec
Details

@zcbenz zcbenz deleted the fix-web-securiy-node-integration branch May 30, 2016

@@ -29,7 +29,7 @@ describe('ipc module', function () {
assert.equal(a.id, 1127)
})
it.only('should work when object has no prototype', function () {
it('should work when object has no prototype', function () {

This comment has been minimized.

@kevinsawicki

kevinsawicki May 31, 2016

Contributor

Sorry about this one 😞

@aggregatejeff

This comment has been minimized.

aggregatejeff commented Jun 1, 2016

Thanks for fixing. This one was painful to find.

I'm also seeing errors with setting webframe zoom level in 1.2.0. It seems related as 1.1.3 is fine...

@kevinsawicki

This comment has been minimized.

Contributor

kevinsawicki commented Jun 1, 2016

I'm also seeing errors with setting webframe zoom level in 1.2.0. It seems related as 1.1.3 is fine...

@aggregatejeff can you open a separate issue for this with details about the error and reproduction steps? Thanks.

@aggregatejeff

This comment has been minimized.

aggregatejeff commented Jun 1, 2016

Will do

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment