Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Pasero <benjpas@microsoft.com>2019-02-06 11:05:48 +0300
committerBenjamin Pasero <benjpas@microsoft.com>2019-02-06 11:05:53 +0300
commita5b56bdb083afa188eb7833f7f17269ddb71bde4 (patch)
tree9ef070ef933ce20ca6bf19e5aa0c2c8952af374d
parentd04106a7807f81e2ee2b6476aadb1e71fef5bef0 (diff)
electron@3.1.3
-rw-r--r--.yarnrc2
-rw-r--r--cgmanifest.json4
-rw-r--r--src/typings/electron.d.ts7
-rw-r--r--test/smoke/package.json2
-rw-r--r--test/smoke/yarn.lock8
5 files changed, 14 insertions, 9 deletions
diff --git a/.yarnrc b/.yarnrc
index 190252d15da..fe7090fa356 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron"
-target "3.1.2"
+target "3.1.3"
runtime "electron"
diff --git a/cgmanifest.json b/cgmanifest.json
index b7e74e39456..21d78500903 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -73,12 +73,12 @@
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
- "commitHash": "bb28fa8e8e797db249a66405146ad0501eaf411a"
+ "commitHash": "72ff292302f95bfe5b4e02085a7be56254b42b0e"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
- "version": "3.1.2"
+ "version": "3.1.3"
},
{
"component": {
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
index 8f72a1bc565..50fb0d3e4f4 100644
--- a/src/typings/electron.d.ts
+++ b/src/typings/electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron 3.1.2
+// Type definitions for Electron 3.1.3
// Project: http://electronjs.org/
// Definitions by: The Electron Team <https://github.com/electron/electron>
// Definitions: https://github.com/electron/electron-typescript-definitions
@@ -7870,6 +7870,11 @@ declare namespace Electron {
*/
checked?: boolean;
/**
+ * If false, the accelerator won't be registered with the system, but it will still
+ * be displayed. Defaults to true.
+ */
+ registerAccelerator?: boolean;
+ /**
* Should be specified for submenu type menu items. If submenu is specified, the
* type: 'submenu' can be omitted. If the value is not a then it will be
* automatically converted to one using Menu.buildFromTemplate.
diff --git a/test/smoke/package.json b/test/smoke/package.json
index fe5adc19357..80351281340 100644
--- a/test/smoke/package.json
+++ b/test/smoke/package.json
@@ -22,7 +22,7 @@
"@types/webdriverio": "4.6.1",
"concurrently": "^3.5.1",
"cpx": "^1.5.0",
- "electron": "3.1.2",
+ "electron": "3.1.3",
"htmlparser2": "^3.9.2",
"mkdirp": "^0.5.1",
"mocha": "^5.2.0",
diff --git a/test/smoke/yarn.lock b/test/smoke/yarn.lock
index 6ca02b80baf..d1e614c487a 100644
--- a/test/smoke/yarn.lock
+++ b/test/smoke/yarn.lock
@@ -596,10 +596,10 @@ electron-download@^4.1.0:
semver "^5.4.1"
sumchecker "^2.0.2"
-electron@3.1.2:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.2.tgz#e410b976c56fc2f783c3b0fb6d757e02eaeab902"
- integrity sha512-B/mXRCN8jGBBx8dvtIgLyW+nE8i9y7K9G6wijU+cLoneqF5al9BgZA1l5xgZEiUrwTtt0cgXIWNwhStt7EDoQQ==
+electron@3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.3.tgz#848fa0fc62d131978cde15ec04ce195a08dc4155"
+ integrity sha512-Y1TbV5py2O0br0JVYh+ew1cW4cIOOgRNRMzwTwWuZNMZ9fK/XLlqsbZr1GpYHdiN2yIU1koO+g4Cw8VuW86NXQ==
dependencies:
"@types/node" "^8.0.24"
electron-download "^4.1.0"