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

update (#21915)

Browse source
This commit is contained in:
Hye Sung Jung 2020-01-29 03:42:25 -06:00 committed by GitHub
parent 28fb2b7ed5
commit 0bd8a97f38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/api/native-theme.md
View file

@ -27,7 +27,7 @@ should use `themeSource` below.
### `nativeTheme.themeSource` ### `nativeTheme.themeSource`
A `String` property that can be `system`, `light` or `dark`. It is used to override and supercede A `String` property that can be `system`, `light` or `dark`. It is used to override and supersede
the value that Chromium has chosen to use internally. the value that Chromium has chosen to use internally.
Setting this property to `system` will remove the override and Setting this property to `system` will remove the override and

2
lib/browser/navigation-controller.js
View file

@ -34,7 +34,7 @@ const NavigationController = (function () {
this.currentIndex++ this.currentIndex++
this.history.push(this.webContents._getURL()) this.history.push(this.webContents._getURL())
} }
this.webContents.on('navigation-entry-commited', (event, url, inPage, replaceEntry) => { this.webContents.on('navigation-entry-committed', (event, url, inPage, replaceEntry) => {
if (this.inPageIndex > -1 && !inPage) { if (this.inPageIndex > -1 && !inPage) {
// Navigated to a new page, clear in-page mark. // Navigated to a new page, clear in-page mark.
this.inPageIndex = -1 this.inPageIndex = -1

2
shell/browser/api/atom_api_web_contents.cc
View file

@ -1304,7 +1304,7 @@ void WebContents::WebContentsDestroyed() {
void WebContents::NavigationEntryCommitted( void WebContents::NavigationEntryCommitted(
const content::LoadCommittedDetails& details) { const content::LoadCommittedDetails& details) {
Emit("navigation-entry-commited", details.entry->GetURL(), Emit("navigation-entry-committed", details.entry->GetURL(),
details.is_same_document, details.did_replace_entry); details.is_same_document, details.did_replace_entry);
} }

2
shell/browser/native_window_mac.mm
View file

@ -1062,7 +1062,7 @@ void NativeWindowMac::SetSimpleFullScreen(bool simple_fullscreen) {
// Hide the titlebar // Hide the titlebar
SetStyleMask(false, NSWindowStyleMaskTitled); SetStyleMask(false, NSWindowStyleMaskTitled);
// Resize the window to accomodate the _entire_ screen size // Resize the window to accommodate the _entire_ screen size
fullscreenFrame.size.height -= fullscreenFrame.size.height -=
[[[NSApplication sharedApplication] mainMenu] menuBarHeight]; [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
} else if (!window_button_visibility_.has_value()) { } else if (!window_button_visibility_.has_value()) {

2
spec-main/chromium-spec.ts
View file

@ -1095,7 +1095,7 @@ describe('chromium features', () => {
// History should have current page by now. // History should have current page by now.
expect((w.webContents as any).length()).to.equal(1) expect((w.webContents as any).length()).to.equal(1)
const waitCommit = emittedOnce(w.webContents, 'navigation-entry-commited') const waitCommit = emittedOnce(w.webContents, 'navigation-entry-committed')
w.webContents.executeJavaScript('window.history.pushState({}, "")') w.webContents.executeJavaScript('window.history.pushState({}, "")')
await waitCommit await waitCommit
// Initial page + pushed state. // Initial page + pushed state.