github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-26 15:58:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2368 from dataich/master

Browse Source 
do not overwrite `node-integration` option
This commit is contained in:
Cheng Zhao
2015-07-29 17:25:30 +08:00
parent 80f45f6226 fc92ceb0b6
commit 046a8e8a08
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
atom/renderer/lib/override.coffee
View File

@@ -61,7 +61,7 @@ window.open = (url, frameName='', features='') ->
(options[name] = parseInt(options[name], 10) if options[name]?) for name in ints
# Inherit the node-integration option of current window.
unless options['node-integration']
unless options['node-integration']?
for arg in process.argv when arg.indexOf('--node-integration=') is 0
options['node-integration'] = arg.substr(-4) is 'true'
break