Skip to content
This repository was archived by the owner on May 22, 2020. It is now read-only.

RUN-5674 | BrowserView creates multiply window/close events #2 #985

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

RUN-5674 | BrowserView creates multiply window/close events #2 #985

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df0be63
fix
tomer-openfin Oct 3, 2019
c2fe001
refactor
tomer-openfin Oct 3, 2019
2bbacb8
destroy check and nicer logic
tomer-openfin Oct 7, 2019
221a889
merging
tomer-openfin Oct 7, 2019
5b935f8
merge
tomer-openfin Oct 10, 2019
de2fa83
Update browser_view.ts
tomer-openfin Oct 17, 2019
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
38 changes: 20 additions & 18 deletions src/browser/api/browser_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,24 +99,25 @@ export async function attach(ofView: OfView, toIdentity: Identity) {
throw new Error(`Could not locate origin window ${previousTarget.uuid}/${previousTarget.name}`);
}

const oldwinMap = windowCloseListenerMap.get(oldWin);

if (previousTarget.name !== toIdentity.name) {
oldWin.browserWindow.removeBrowserView(view);
of_events.emit(route.window('view-detached', previousTarget.uuid, previousTarget.name), {
viewIdentity: {uuid: ofView.uuid, name: ofView.name},
target: toIdentity,
previousTarget
});
if (oldwinMap) {
const listener = oldwinMap.get(ofView);
if (typeof listener === 'function') {
of_events.removeListener(route.window('closed', previousTarget.uuid, previousTarget.name), listener);
if (oldWin) {
const oldWinMap = windowCloseListenerMap.get(oldWin);
if (previousTarget.name !== toIdentity.name) {
oldWin.browserWindow.removeBrowserView(view);
of_events.emit(route.window('view-detached', previousTarget.uuid, previousTarget.name), {
viewIdentity: {uuid: ofView.uuid, name: ofView.name},
target: toIdentity,
previousTarget
});
if (oldWinMap) {
const listener = oldWinMap.get(ofView);
if (typeof listener === 'function') {
of_events.removeListener(route.window('closed', previousTarget.uuid, previousTarget.name), listener);
}
oldWinMap.delete(ofView);
}
oldwinMap.delete(ofView);
}
} else if (oldwinMap && oldwinMap.has(ofView)) {
return;
} else if (oldWinMap && oldWinMap.has(ofView)) {
return;
}
}

const bWin = ofWin.browserWindow;
Expand Down Expand Up @@ -145,6 +146,7 @@ export async function attach(ofView: OfView, toIdentity: Identity) {
});
}
}

export async function destroy (ofView: OfView) {
const {uuid, name, target, view} = ofView;
removeBrowserView(ofView);
Expand Down Expand Up @@ -200,4 +202,4 @@ export function addEventListener({uuid, name}: Identity, type: string, listener:
of_events.removeListener(eventString, safeListener);
};
return unsubscribe;
}
}