diff options
| author | Robo <hop2deep@gmail.com> | 2020-05-02 08:58:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 08:58:09 +0300 |
| commit | 2348a4f26fafcc236ca077dc4d24e376827c0645 (patch) | |
| tree | 321b5af1beace5b8f543e852a27504c99b2c3d3c | |
| parent | eee5d36cbf70c906d66bcdc03861b3feaa445d75 (diff) | |
chore: bump electron@7.2.4 (#96807)
| -rw-r--r-- | .yarnrc | 2 | ||||
| -rw-r--r-- | cgmanifest.json | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/vs/platform/menubar/electron-main/menubar.ts | 3 | ||||
| -rw-r--r-- | yarn.lock | 8 |
5 files changed, 10 insertions, 9 deletions
@@ -1,3 +1,3 @@ disturl "https://atom.io/download/electron" -target "7.2.2" +target "7.2.4" runtime "electron" diff --git a/cgmanifest.json b/cgmanifest.json index 2d5e8a2d66c..09478ca403e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -60,12 +60,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "959e80cc53cbebf8eb1d62eb2d14fa8fd86b0394" + "commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "7.2.2" + "version": "7.2.4" }, { "component": { diff --git a/package.json b/package.json index 775c1428f6e..365353cc311 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.2", + "electron": "7.2.4", "eslint": "6.8.0", "eslint-plugin-jsdoc": "^19.1.0", "event-stream": "3.3.4", diff --git a/src/vs/platform/menubar/electron-main/menubar.ts b/src/vs/platform/menubar/electron-main/menubar.ts index 3f26d267855..dd0251290f2 100644 --- a/src/vs/platform/menubar/electron-main/menubar.ts +++ b/src/vs/platform/menubar/electron-main/menubar.ts @@ -702,7 +702,8 @@ export class Menubar { } // DevTools focused - if (activeWindow.webContents.isDevToolsFocused()) { + if (activeWindow.webContents.isDevToolsFocused() && + activeWindow.webContents.devToolsWebContents) { return contextSpecificHandlers.inDevTools(activeWindow.webContents.devToolsWebContents); } diff --git a/yarn.lock b/yarn.lock index b9aa69f6d40..19b82930df9 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.2: - version "7.2.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.2.tgz#92b159fa6e6c31dfcfe0c2818c7baacb81fa1c5f" - integrity sha512-8ppCjch2LRbi5JJ9D+gn+Q9erShNLDcN5ODRAPr/MAHqhTTlGBqCcvNMlCzRCEVV75PouKxVm7NjSKXBYlD9QA== +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== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12" |