mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4955 from atom/remove-node-integration-disable-path

Browse source 
Remove path for nodeIntegration value of 'disable'
This commit is contained in:
Cheng Zhao 2016-04-01 11:14:30 +09:00
commit 7353fb4296
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/web_contents_preferences.cc
View file

@ -97,11 +97,6 @@ void WebContentsPreferences::AppendExtraCommandLineSwitches(
// Check if we have node integration specified.
bool node_integration = true;
web_preferences.GetBoolean(options::kNodeIntegration, &node_integration);
// Be compatible with old API of "node-integration" option.
std::string old_token;
if (web_preferences.GetString(options::kNodeIntegration, &old_token) &&
old_token != "disable")
node_integration = true;
command_line->AppendSwitchASCII(switches::kNodeIntegration,
node_integration ? "true" : "false");

2
lib/renderer/init.js
View file

@ -84,7 +84,7 @@ if (window.location.protocol === 'chrome-devtools:') {
}
}
if (nodeIntegration === 'true' || nodeIntegration === 'all' || nodeIntegration === 'except-iframe' || nodeIntegration === 'manual-enable-iframe') {
if (nodeIntegration === 'true') {
// Export node bindings to global.
global.require = require
global.module = module