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

Merge pull request #5500 from radarhere/master

Browse source 
Fixed typo
This commit is contained in:
Cheng Zhao 2016-05-12 10:26:39 +09:00
commit 9a35d54ecf
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/native_window.cc
View file

@ -412,7 +412,7 @@ void NativeWindow::RendererUnresponsive(content::WebContents* source) {
// responsive event soon. This could happen after the whole application had // responsive event soon. This could happen after the whole application had
// blocked for a while. // blocked for a while.
// Also notice that when closing this event would be ignored because we have // Also notice that when closing this event would be ignored because we have
// explicity started a close timeout counter. This is on purpose because we // explicitly started a close timeout counter. This is on purpose because we
// don't want the unresponsive event to be sent too early when user is closing // don't want the unresponsive event to be sent too early when user is closing
// the window. // the window.
ScheduleUnresponsiveEvent(50); ScheduleUnresponsiveEvent(50);

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

@ -57,7 +57,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
* `alwaysOnTop` Boolean - Whether the window should always stay on top of * `alwaysOnTop` Boolean - Whether the window should always stay on top of
other windows. Default is `false`. other windows. Default is `false`.
* `fullscreen` Boolean - Whether the window should show in fullscreen. When * `fullscreen` Boolean - Whether the window should show in fullscreen. When
explicity set to `false` the fullscreen button will be hidden or disabled explicitly set to `false` the fullscreen button will be hidden or disabled
on OS X. Default is `false`. on OS X. Default is `false`.
* `fullscreenable` Boolean - Whether the maximize/zoom button on OS X should * `fullscreenable` Boolean - Whether the maximize/zoom button on OS X should
toggle full screen mode or maximize window. Default is `true`. toggle full screen mode or maximize window. Default is `true`.