Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
旅途_2012
vscode
提交
c8c1d83b
V
vscode
项目概览
旅途_2012
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c8c1d83b
编写于
8月 31, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debt - upstream some changes from electron-3.0.x branch
上级
8c27e80e
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
8 addition
and
22 deletion
+8
-22
src/vs/base/browser/dom.ts
src/vs/base/browser/dom.ts
+0
-1
src/vs/base/node/ps.ts
src/vs/base/node/ps.ts
+2
-2
src/vs/base/parts/tree/browser/treeView.ts
src/vs/base/parts/tree/browser/treeView.ts
+0
-1
src/vs/code/electron-main/auth.ts
src/vs/code/electron-main/auth.ts
+1
-4
src/vs/code/electron-main/sharedProcess.ts
src/vs/code/electron-main/sharedProcess.ts
+2
-1
src/vs/code/electron-main/window.ts
src/vs/code/electron-main/window.ts
+1
-2
src/vs/platform/issue/electron-main/issueService.ts
src/vs/platform/issue/electron-main/issueService.ts
+2
-8
src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
...orkbench/parts/webview/electron-browser/webviewElement.ts
+0
-3
未找到文件。
src/vs/base/browser/dom.ts
浏览文件 @
c8c1d83b
...
...
@@ -818,7 +818,6 @@ export function isHTMLElement(o: any): o is HTMLElement {
export
const
EventType
=
{
// Mouse
CLICK
:
'
click
'
,
AUXCLICK
:
'
auxclick
'
,
// >= Chrome 56
DBLCLICK
:
'
dblclick
'
,
MOUSE_UP
:
'
mouseup
'
,
MOUSE_DOWN
:
'
mousedown
'
,
...
...
src/vs/base/node/ps.ts
浏览文件 @
c8c1d83b
...
...
@@ -60,7 +60,7 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
function
findName
(
cmd
:
string
):
string
{
const
RENDERER
_PROCESS_HINT
=
/--disable-blink-features=Auxclick/
;
const
SHARED
_PROCESS_HINT
=
/--disable-blink-features=Auxclick/
;
const
WINDOWS_WATCHER_HINT
=
/
\\
watcher
\\
win32
\\
CodeHelper
\.
exe/
;
const
WINDOWS_CRASH_REPORTER
=
/--crashes-directory/
;
const
WINDOWS_PTY
=
/
\\
pipe
\\
winpty-control/
;
...
...
@@ -91,7 +91,7 @@ export function listProcesses(rootPid: number): Promise<ProcessItem> {
let
matches
=
TYPE
.
exec
(
cmd
);
if
(
matches
&&
matches
.
length
===
2
)
{
if
(
matches
[
1
]
===
'
renderer
'
)
{
if
(
!
RENDERER
_PROCESS_HINT
.
exec
(
cmd
))
{
if
(
SHARED
_PROCESS_HINT
.
exec
(
cmd
))
{
return
'
shared-process
'
;
}
...
...
src/vs/base/parts/tree/browser/treeView.ts
浏览文件 @
c8c1d83b
...
...
@@ -553,7 +553,6 @@ export class TreeView extends HeightMap {
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
domNode
,
'
mousedown
'
,
(
e
)
=>
this
.
onMouseDown
(
e
)));
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
domNode
,
'
mouseup
'
,
(
e
)
=>
this
.
onMouseUp
(
e
)));
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
wrapper
,
'
click
'
,
(
e
)
=>
this
.
onClick
(
e
)));
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
wrapper
,
'
auxclick
'
,
(
e
)
=>
this
.
onClick
(
e
)));
// >= Chrome 56
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
domNode
,
'
contextmenu
'
,
(
e
)
=>
this
.
onContextMenu
(
e
)));
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
wrapper
,
Touch
.
EventType
.
Tap
,
(
e
)
=>
this
.
onTap
(
e
)));
this
.
viewListeners
.
push
(
DOM
.
addDisposableListener
(
this
.
wrapper
,
Touch
.
EventType
.
Change
,
(
e
)
=>
this
.
onTouchChange
(
e
)));
...
...
src/vs/code/electron-main/auth.ts
浏览文件 @
c8c1d83b
...
...
@@ -56,10 +56,7 @@ export class ProxyAuthHandler {
width
:
450
,
height
:
220
,
show
:
true
,
title
:
'
VS Code
'
,
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
title
:
'
VS Code
'
};
const
focusedWindow
=
this
.
windowsMainService
.
getFocusedWindow
();
...
...
src/vs/code/electron-main/sharedProcess.ts
浏览文件 @
c8c1d83b
...
...
@@ -40,7 +40,8 @@ export class SharedProcess implements ISharedProcess {
webPreferences
:
{
images
:
false
,
webaudio
:
false
,
webgl
:
false
webgl
:
false
,
disableBlinkFeatures
:
'
Auxclick
'
// do NOT change, allows us to identify this window as shared-process in the process explorer
}
});
const
config
=
assign
({
...
...
src/vs/code/electron-main/window.ts
浏览文件 @
c8c1d83b
...
...
@@ -133,8 +133,7 @@ export class CodeWindow implements ICodeWindow {
// want to enforce that Code stays in the foreground. This triggers a disable_hidden_
// flag that Electron provides via patch:
// https://github.com/electron/libchromiumcontent/blob/master/patches/common/chromium/disable_hidden.patch
'
backgroundThrottling
'
:
false
,
disableBlinkFeatures
:
'
Auxclick
'
// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
'
backgroundThrottling
'
:
false
}
};
...
...
src/vs/platform/issue/electron-main/issueService.ts
浏览文件 @
c8c1d83b
...
...
@@ -67,10 +67,7 @@ export class IssueService implements IIssueService {
x
:
position
.
x
,
y
:
position
.
y
,
title
:
localize
(
'
issueReporter
'
,
"
Issue Reporter
"
),
backgroundColor
:
data
.
styles
.
backgroundColor
||
DEFAULT_BACKGROUND_COLOR
,
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
backgroundColor
:
data
.
styles
.
backgroundColor
||
DEFAULT_BACKGROUND_COLOR
});
this
.
_issueWindow
.
setMenuBarVisibility
(
false
);
// workaround for now, until a menu is implemented
...
...
@@ -117,10 +114,7 @@ export class IssueService implements IIssueService {
x
:
position
.
x
,
y
:
position
.
y
,
backgroundColor
:
data
.
styles
.
backgroundColor
,
title
:
localize
(
'
processExplorer
'
,
"
Process Explorer
"
),
webPreferences
:
{
disableBlinkFeatures
:
'
Auxclick
'
}
title
:
localize
(
'
processExplorer
'
,
"
Process Explorer
"
)
});
this
.
_processExplorerWindow
.
setMenuBarVisibility
(
false
);
...
...
src/vs/workbench/parts/webview/electron-browser/webviewElement.ts
浏览文件 @
c8c1d83b
...
...
@@ -49,9 +49,6 @@ export class WebviewElement extends Disposable {
this
.
_webview
=
document
.
createElement
(
'
webview
'
);
this
.
_webview
.
setAttribute
(
'
partition
'
,
this
.
_options
.
allowSvgs
?
'
webview
'
:
`webview
${
Date
.
now
()}
`
);
// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
this
.
_webview
.
setAttribute
(
'
disableblinkfeatures
'
,
'
Auxclick
'
);
this
.
_webview
.
setAttribute
(
'
disableguestresize
'
,
''
);
this
.
_webview
.
setAttribute
(
'
webpreferences
'
,
'
contextIsolation=yes
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录