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

Merge remote-tracking branch 'origin/master' into hands-on-hand-off

Browse source
This commit is contained in:
Charlie Hess 2016-05-02 12:18:26 -07:00
commit b53480e15c
75 changed files with 1097 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/api/process.md
View file

@ -7,8 +7,8 @@ upstream node:
* `process.type` String - Process's type, can be `browser` (i.e. main process)
or `renderer`.
* `process.versions['electron']` String - Version of Electron.
* `process.versions['chrome']` String - Version of Chromium.
* `process.versions.electron` String - Version of Electron.
* `process.versions.chrome` String - Version of Chromium.
* `process.resourcesPath` String - Path to JavaScript source code.
* `process.mas` Boolean - For Mac App Store build, this value is `true`, for
other builds it is `undefined`.

2
docs/api/system-preferences.md
View file

@ -59,7 +59,7 @@ not (transparent windows won't work correctly when DWM composition is disabled):
let browserOptions = {width: 1000, height: 800};
// Make the window transparent only if the platform supports it.
if (process.platform !== 'win32' || app.isAeroGlassEnabled()) {
if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
browserOptions.transparent = true;
browserOptions.frame = false;
}