mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-01-21 03:51:15 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: provide browserViewMetaData prefix for every additionalArguments

Browse source 
this fixes https://github.com/tiddly-gittly/TiddlyGit-Desktop/issues/80
This commit is contained in:
lin onetwo 2021-07-09 01:20:21 +08:00
parent eb8a7ee647
commit c514cff308
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/services/view/index.ts
View file

@ -231,9 +231,7 @@ export class View implements IViewService {
session: sessionOfView,
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
additionalArguments: [
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
`${MetaDataChannel.browserViewMetaData}${WindowNames.view}`,
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
`${MetaDataChannel.browserViewMetaData}${JSON.stringify(browserViewMetaData)}`,
],
};

7
src/services/view/setupViewEventHandlers.ts
View file

@ -16,7 +16,7 @@ import type { IWorkspaceViewService } from '@services/workspacesView/interface';
import type { IWindowService } from '@services/windows/interface';
import { WindowNames, IBrowserViewMetaData } from '@services/windows/WindowProperties';
import { container } from '@services/container';
import { ViewChannel, WindowChannel } from '@/constants/channels';
import { MetaDataChannel, ViewChannel, WindowChannel } from '@/constants/channels';
import { logger } from '@services/libs/log';
import { getLocalHostUrlWithActualIP } from '@services/libs/url';
@ -299,7 +299,10 @@ async function handleNewWindow(
...(JSON.parse(sharedWebPreferences?.additionalArguments?.[1] ?? '{}') as IBrowserViewMetaData),
};
const metadataConfig = {
additionalArguments: [WindowNames.newWindow, JSON.stringify(browserViewMetaData)],
additionalArguments: [
`${MetaDataChannel.browserViewMetaData}${WindowNames.newWindow}`,
`${MetaDataChannel.browserViewMetaData}${JSON.stringify(browserViewMetaData)}`,
],
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
};
const newOptions: BrowserWindowConstructorOptions = cmdClick

2
src/services/windows/index.ts
View file

@ -139,7 +139,7 @@ export class Window implements IWindowService {
allowRunningInsecureContent: false,
contextIsolation: true,
preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
additionalArguments: [windowName, JSON.stringify(meta)],
additionalArguments: [`${MetaDataChannel.browserViewMetaData}${windowName}`, `${MetaDataChannel.browserViewMetaData}${JSON.stringify(meta)}`],
},
parent: isMainWindow || attachToMenubar ? undefined : this.get(WindowNames.main),
};