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

Merge pull request #2372 from atom/allow-insecure-content

Browse source 
Add allowing-insecure-content option
This commit is contained in:
Cheng Zhao 2015-07-30 09:38:27 +08:00
commit bbce2c7e2f
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/native_window.cc
View file

@ -439,6 +439,10 @@ void NativeWindow::OverrideWebkitPrefs(content::WebPreferences* prefs) {
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)

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

@ -76,7 +76,14 @@ You can also create a window without chrome by using
textured window. Defaults to `true`.
* `web-preferences` Object - Settings of web page's features
* `javascript` Boolean
* `web-security` Boolean
* `web-security` Boolean - When setting `false`, it will disable the same-origin
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.
* `allow-running-insecure-content` Boolean - Allow a https page to run JavaScript,
CSS or plugins from http URLs.
* `images` Boolean
* `java` Boolean
* `text-areas-are-resizable` Boolean