diff options
| author | Robo <hop2deep@gmail.com> | 2020-05-18 22:51:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 22:51:22 +0300 |
| commit | 949722520701ee8b2cb3b2a550d7b1e7246a9a26 (patch) | |
| tree | bbf168510792c668f198e871da576f6326ab0a9f | |
| parent | 24e33630b7474805f82252e919ed4155795b7249 (diff) | |
chore: bump electron@8.2.5 (#98109)
| -rw-r--r-- | .yarnrc | 2 | ||||
| -rw-r--r-- | cgmanifest.json | 12 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/vs/base/parts/contextmenu/electron-main/contextmenu.ts | 3 | ||||
| -rw-r--r-- | yarn.lock | 8 |
5 files changed, 14 insertions, 13 deletions
@@ -1,3 +1,3 @@ disturl "https://atom.io/download/electron" -target "7.2.4" +target "8.2.5" runtime "electron" diff --git a/cgmanifest.json b/cgmanifest.json index 09478ca403e..4357fd1e9de 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -6,7 +6,7 @@ "git": { "name": "chromium", "repositoryUrl": "https://chromium.googlesource.com/chromium/src", - "commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf" + "commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8" } }, "licenseDetail": [ @@ -40,7 +40,7 @@ "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ], "isOnlyProductionDependency": true, - "version": "78.0.3904.130" + "version": "80.0.3987.165" }, { "component": { @@ -48,11 +48,11 @@ "git": { "name": "nodejs", "repositoryUrl": "https://github.com/nodejs/node", - "commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a" + "commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad" } }, "isOnlyProductionDependency": true, - "version": "12.8.1" + "version": "12.13.0" }, { "component": { @@ -60,12 +60,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565" + "commitHash": "6c42564337697f1907627ad96b7bd4801ef5be20" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "7.2.4" + "version": "8.2.5" }, { "component": { diff --git a/package.json b/package.json index f2623317329..8c9d17f702b 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "css-loader": "^3.2.0", "debounce": "^1.0.0", "deemon": "^1.4.0", - "electron": "7.2.4", + "electron": "8.2.5", "eslint": "6.8.0", "eslint-plugin-jsdoc": "^19.1.0", "event-stream": "3.3.4", diff --git a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts index 6222be78028..7b43355ed6d 100644 --- a/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts +++ b/src/vs/base/parts/contextmenu/electron-main/contextmenu.ts @@ -9,9 +9,10 @@ import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_ export function registerContextMenuListener(): void { ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => { const menu = createMenu(event, onClickChannel, items); + const window = BrowserWindow.fromWebContents(event.sender); menu.popup({ - window: BrowserWindow.fromWebContents(event.sender), + window: window ? window : undefined, x: options ? options.x : undefined, y: options ? options.y : undefined, positioningItem: options ? options.positioningItem : undefined, diff --git a/yarn.lock b/yarn.lock index d3532221bac..d812b68afde 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2715,10 +2715,10 @@ electron-to-chromium@^1.2.7: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0= -electron@7.2.4: - version "7.2.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9" - integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg== +electron@8.2.5: + version "8.2.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-8.2.5.tgz#ae3cb23d5517b2189fd35298e487198d65d1a291" + integrity sha512-LxSCUwmlfJtRwthd3ofpYaZ+1C2hQSW8Ep1DD9K3VbnDItO+kb3t1z35daJgAab78j54aOwo9gMxJtvU0Ftj6w== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" |