Skip to content

Pass webContents rather than view to getWindowFromViewContents #2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 23, 2025
Merged

Pass webContents rather than view to getWindowFromViewContents #2658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions main/viewManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function createView (existingViewId, id, webPreferences, boundsString, events) {
view.webContents.on(event, function (e) {
var args = Array.prototype.slice.call(arguments).slice(1)

const eventTarget = getWindowFromViewContents(view) || windows.getCurrent()
const eventTarget = getWindowFromViewContents(view.webContents) || windows.getCurrent()

if (!eventTarget) {
//this can happen during shutdown - windows can be destroyed before the corresponding views, and the view can emit an event during that time
Expand Down Expand Up @@ -92,7 +92,7 @@ function createView (existingViewId, id, webPreferences, boundsString, events) {
(https://github.com/minbrowser/min/issues/1835)
*/
if (!details.features) {
const eventTarget = getWindowFromViewContents(view) || windows.getCurrent()
const eventTarget = getWindowFromViewContents(view.webContents) || windows.getCurrent()

getWindowWebContents(eventTarget).send('view-event', {
tabId: id,
Expand All @@ -112,7 +112,7 @@ function createView (existingViewId, id, webPreferences, boundsString, events) {
var popupId = Math.random().toString()
temporaryPopupViews[popupId] = view

const eventTarget = getWindowFromViewContents(view) || windows.getCurrent()
const eventTarget = getWindowFromViewContents(view.webContents) || windows.getCurrent()

getWindowWebContents(eventTarget).send('view-event', {
tabId: id,
Expand All @@ -135,7 +135,7 @@ function createView (existingViewId, id, webPreferences, boundsString, events) {
return
}

const eventTarget = getWindowFromViewContents(view) || windows.getCurrent()
const eventTarget = getWindowFromViewContents(view.webContents) || windows.getCurrent()

if (!eventTarget) {
//this can happen during shutdown - windows can be destroyed before the corresponding views, and the view can emit an event during that time
Expand Down Expand Up @@ -220,7 +220,7 @@ function createView (existingViewId, id, webPreferences, boundsString, events) {
if (hasJS !== shouldHaveJS) {
setTimeout(function () {
view.webContents.stop()
const currentWindow = getWindowFromViewContents(view)
const currentWindow = getWindowFromViewContents(view.webContents)
destroyView(id)
const newView = createView(existingViewId, id, Object.assign({}, webPreferences, { javascript: shouldHaveJS }), boundsString, events)
loadURLInView(id, event.url, currentWindow)
Expand Down Expand Up @@ -293,8 +293,8 @@ function focusView (id) {
if (viewMap[id] && (viewMap[id].webContents.getURL() !== '' || viewMap[id].webContents.isLoading())) {
viewMap[id].webContents.focus()
return true
} else if (getWindowFromViewContents(viewMap[id])) {
getWindowWebContents(getWindowFromViewContents(viewMap[id])).focus()
} else if (getWindowFromViewContents(viewMap[id]?.webContents)) {
getWindowWebContents(getWindowFromViewContents(viewMap[id]?.webContents)).focus()
return true
}
}
Expand Down