Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
19494e6a
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
19494e6a
编写于
7月 24, 2019
作者:
R
Robo
提交者:
GitHub
7月 24, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #77620 from microsoft/robo/update_electron_4
chore: Bump electron@4.2.7
上级
78c37417
0899c8ca
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
46 addition
and
43 deletion
+46
-43
.yarnrc
.yarnrc
+1
-1
cgmanifest.json
cgmanifest.json
+2
-2
src/typings/electron.d.ts
src/typings/electron.d.ts
+38
-35
test/smoke/package.json
test/smoke/package.json
+1
-1
test/smoke/yarn.lock
test/smoke/yarn.lock
+4
-4
未找到文件。
.yarnrc
浏览文件 @
19494e6a
disturl "https://atom.io/download/electron"
target "4.2.
5
"
target "4.2.
7
"
runtime "electron"
cgmanifest.json
浏览文件 @
19494e6a
...
...
@@ -60,12 +60,12 @@
"git"
:
{
"name"
:
"electron"
,
"repositoryUrl"
:
"https://github.com/electron/electron"
,
"commitHash"
:
"
5d67ec3da5376a5058990e8a9557bc9124ad59a8
"
"commitHash"
:
"
36ea114ac0616e469e75ae94e6d53af48925e036
"
}
},
"isOnlyProductionDependency"
:
true
,
"license"
:
"MIT"
,
"version"
:
"4.2.
5
"
"version"
:
"4.2.
7
"
},
{
"component"
:
{
...
...
src/typings/electron.d.ts
浏览文件 @
19494e6a
// Type definitions for Electron 4.2.
5
// Type definitions for Electron 4.2.
7
// Project: http://electronjs.org/
// Definitions by: The Electron Team <https://github.com/electron/electron>
// Definitions: https://github.com/electron/electron-typescript-definitions
...
...
@@ -3479,14 +3479,14 @@ declare namespace Electron {
* Creates a new NativeImage instance from the NSImage that maps to the given image
* name. See NSImageName for a list of possible values. The hslShift is applied to
* the image with the following rules This means that [-1, 0, 1] will make the
* image completely white and [-1, 1, 0] will make the image completely black. In
* some cases, the NSImageName doesn't match its string representation; one example
* of this is NSFolderImageName, whose string representation would actually be
* NSFolder. Therefore, you'll need to determine the correct string representation
* for your image before passing it in. This can be done with the following: echo
* -e '#import <Cocoa/Cocoa.h>\nint main() { NSLog(@"%@", SYSTEM_IMAGE_NAME); }' |
* clang -otest -x objective-c -framework Cocoa - && ./test where SYSTEM_IMAGE_NAME
* should be replaced with any value from this list.
* image completely white and [-1, 1, 0] will make the image completely black. In
* some cases, the NSImageName doesn't match its string representation; one example
* of this is NSFolderImageName, whose string representation would actually be
* NSFolder. Therefore, you'll need to determine the correct string representation
* for your image before passing it in. This can be done with the following: echo
* -e '#import <Cocoa/Cocoa.h>\nint main() { NSLog(@"%@", SYSTEM_IMAGE_NAME); }' |
* clang -otest -x objective-c -framework Cocoa - && ./test where SYSTEM_IMAGE_NAME
* should be replaced with any value from this list.
*/
static
createFromNamedImage
(
imageName
:
string
,
hslShift
:
number
[]):
NativeImage
;
/**
...
...
@@ -3737,6 +3737,17 @@ declare namespace Electron {
once
(
event
:
'
unlock-screen
'
,
listener
:
Function
):
this
;
addListener
(
event
:
'
unlock-screen
'
,
listener
:
Function
):
this
;
removeListener
(
event
:
'
unlock-screen
'
,
listener
:
Function
):
this
;
/**
* Calculate the system idle state. idleThreshold is the amount of time (in
* seconds) before considered idle. callback will be called synchronously on some
* systems and with an idleState argument that describes the system's state. locked
* is available on supported systems only.
*/
querySystemIdleState
(
idleThreshold
:
number
,
callback
:
(
idleState
:
'
active
'
|
'
idle
'
|
'
locked
'
|
'
unknown
'
)
=>
void
):
void
;
/**
* Calculate system idle time in seconds.
*/
querySystemIdleTime
(
callback
:
(
idleTime
:
number
)
=>
void
):
void
;
}
interface
PowerSaveBlocker
extends
EventEmitter
{
...
...
@@ -4418,30 +4429,6 @@ declare namespace Electron {
* The new RGBA color the user assigned to be their system accent color.
*/
newColor
:
string
)
=>
void
):
this
;
/**
* NOTE: This event is only emitted after you have called
* startAppLevelAppearanceTrackingOS
*/
on
(
event
:
'
appearance-changed
'
,
listener
:
(
/**
* Can be `dark` or `light`
*/
newAppearance
:
(
'
dark
'
|
'
light
'
))
=>
void
):
this
;
once
(
event
:
'
appearance-changed
'
,
listener
:
(
/**
* Can be `dark` or `light`
*/
newAppearance
:
(
'
dark
'
|
'
light
'
))
=>
void
):
this
;
addListener
(
event
:
'
appearance-changed
'
,
listener
:
(
/**
* Can be `dark` or `light`
*/
newAppearance
:
(
'
dark
'
|
'
light
'
))
=>
void
):
this
;
removeListener
(
event
:
'
appearance-changed
'
,
listener
:
(
/**
* Can be `dark` or `light`
*/
newAppearance
:
(
'
dark
'
|
'
light
'
))
=>
void
):
this
;
on
(
event
:
'
color-changed
'
,
listener
:
(
event
:
Event
)
=>
void
):
this
;
once
(
event
:
'
color-changed
'
,
listener
:
(
event
:
Event
)
=>
void
):
this
;
addListener
(
event
:
'
color-changed
'
,
listener
:
(
event
:
Event
)
=>
void
):
this
;
...
...
@@ -8789,17 +8776,33 @@ declare namespace Electron {
* The type of media access being requested, can be video, audio or unknown
*/
mediaType
:
(
'
video
'
|
'
audio
'
|
'
unknown
'
);
/**
* The last URL the requesting frame loaded
*/
requestingUrl
:
string
;
/**
* Whether the frame making the request is the main frame
*/
isMainFrame
:
boolean
;
}
interface
PermissionRequestHandlerDetails
{
/**
* The url of the openExternal request.
*/
externalURL
:
string
;
externalURL
?
:
string
;
/**
* The types of media access being requested, elements can be video or audio
*/
mediaTypes
:
Array
<
'
video
'
|
'
audio
'
>
;
mediaTypes
?:
Array
<
'
video
'
|
'
audio
'
>
;
/**
* The last URL the requesting frame loaded
*/
requestingUrl
:
string
;
/**
* Whether the frame making the request is the main frame
*/
isMainFrame
:
boolean
;
}
interface
PluginCrashedEvent
extends
Event
{
...
...
test/smoke/package.json
浏览文件 @
19494e6a
...
...
@@ -22,7 +22,7 @@
"@types/webdriverio"
:
"4.6.1"
,
"concurrently"
:
"^3.5.1"
,
"cpx"
:
"^1.5.0"
,
"electron"
:
"4.2.
5
"
,
"electron"
:
"4.2.
7
"
,
"htmlparser2"
:
"^3.9.2"
,
"mkdirp"
:
"^0.5.1"
,
"mocha"
:
"^5.2.0"
,
...
...
test/smoke/yarn.lock
浏览文件 @
19494e6a
...
...
@@ -676,10 +676,10 @@ electron-download@^4.1.0:
semver "^5.4.1"
sumchecker "^2.0.2"
electron@4.2.
5
:
version "4.2.
5
"
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.
5.tgz#1d1432c38e2b2190318f7ca30897cdfdcf942e5
a"
integrity sha512-
P132MXzTtyn2ZaekhKi5JeHzmTAMuR/uQt4hrg3vfJV7fpncx9SL6UFwHAK1DU13iiyZJqqIziNUu+o8nODHs
A==
electron@4.2.
7
:
version "4.2.
7
"
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.
7.tgz#bdd2dbf489a4a4255405bd8330cc8509831d29b
a"
integrity sha512-
Azpkw0OPzKVipSsN9/0DrBQhXOpG48Q1gTG7Akchtv37s8TijMe403TUgHxGGhw2ti117ek51kYf7NXLhjXqo
A==
dependencies:
"@types/node" "^10.12.18"
electron-download "^4.1.0"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录