Merge pull request #13294 from electron/MarshallOfSound-patch-1

Mark browser window affinity as experimental
This commit is contained in:
John Kleinschmidt 2018-06-19 11:20:22 -04:00 committed by GitHub
commit 0fdcc5d485
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -287,7 +287,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
between the web pages even when you specified different values for them, between the web pages even when you specified different values for them,
including but not limited to `preload`, `sandbox` and `nodeIntegration`. including but not limited to `preload`, `sandbox` and `nodeIntegration`.
So it is suggested to use exact same `webPreferences` for web pages with So it is suggested to use exact same `webPreferences` for web pages with
the same `affinity`. the same `affinity`. _This property is experimental_
* `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents * `zoomFactor` Number (optional) - The default zoom factor of the page, `3.0` represents
`300%`. Default is `1.0`. `300%`. Default is `1.0`.
* `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`. * `javascript` Boolean (optional) - Enables JavaScript support. Default is `true`.