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

Make 'allow-displaying-insecure-content' and

Browse source 
'allow-running-insecure-content' higher priority than `web-security`.
This commit is contained in:
Haojian Wu 2015-07-29 18:07:06 +08:00
parent 1d0568dd5b
commit f154da38e6
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/native_window.cc
View file

@ -434,15 +434,15 @@ void NativeWindow::OverrideWebkitPrefs(content::WebPreferences* prefs) {
prefs->experimental_webgl_enabled = b;
if (web_preferences_.Get("webaudio", &b))
prefs->webaudio_enabled = b;
if (web_preferences_.Get("allow-displaying-insecure-content", &b))
prefs->allow_displaying_insecure_content = b;
if (web_preferences_.Get("allow-running-insecure-content", &b))
prefs->allow_running_insecure_content = b;
if (web_preferences_.Get("web-security", &b)) {
prefs->web_security_enabled = b;
prefs->allow_displaying_insecure_content = !b;
prefs->allow_running_insecure_content = !b;
}
if (web_preferences_.Get("allow-displaying-insecure-content", &b))
prefs->allow_displaying_insecure_content = b;
if (web_preferences_.Get("allow-running-insecure-content", &b))
prefs->allow_running_insecure_content = b;
if (web_preferences_.Get("extra-plugin-dirs", &list)) {
if (content::PluginService::GetInstance()->NPAPIPluginsSupported()) {
for (size_t i = 0; i < list.size(); ++i)

11
docs/api/browser-window.md
View file

@ -77,14 +77,13 @@ You can also create a window without chrome by using
* `web-preferences` Object - Settings of web page's features
* `javascript` Boolean
* `web-security` Boolean - When setting `false`, it will disable the same-origin
policy(Ususally using testing websites by people) and set `allow_displaying_insecure_content`
and `allow_running_insecure_content` to `true`.
policy(Usually using testing websites by people), and set `allow_displaying_insecure_content`
and `allow_running_insecure_content` to `true` if these two options are not
set by user.
* `allow-displaying-insecure-content` Boolean - Allow a https page to display
content like image from http URLs. This option will be overrided to `true`
when `web-security` option is set.
content like image from http URLs.
* `allow-running-insecure-content` Boolean - Allow a https page to run JavaScript,
CSS or plugins from http URLs. This option will be overrided to `true` when
`web-security` option is set.
CSS or plugins from http URLs.
* `images` Boolean
* `java` Boolean
* `text-areas-are-resizable` Boolean