Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
05f3932a
V
vscode
项目概览
掘金者说
/
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,发现更多精彩内容 >>
提交
05f3932a
编写于
10月 11, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #60270
上级
0b4b0dcc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
29 addition
and
13 deletion
+29
-13
src/vs/workbench/electron-browser/workbench.ts
src/vs/workbench/electron-browser/workbench.ts
+27
-12
src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
...ch/parts/webview/electron-browser/webview.contribution.ts
+2
-1
未找到文件。
src/vs/workbench/electron-browser/workbench.ts
浏览文件 @
05f3932a
...
...
@@ -8,7 +8,7 @@ import 'vs/css!./media/workbench';
import
{
localize
}
from
'
vs/nls
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IDisposable
,
dispose
,
toDisposable
,
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
Event
,
Emitter
,
once
}
from
'
vs/base/common/event
'
;
import
*
as
DOM
from
'
vs/base/browser/dom
'
;
import
{
RunOnceScheduler
}
from
'
vs/base/common/async
'
;
import
*
as
browser
from
'
vs/base/browser/browser
'
;
...
...
@@ -501,6 +501,10 @@ export class Workbench extends Disposable implements IPartService {
// Fullscreen changes
this
.
_register
(
browser
.
onDidChangeFullscreen
(()
=>
this
.
onFullscreenChanged
()));
// Group changes
this
.
_register
(
this
.
editorGroupService
.
onDidAddGroup
(()
=>
this
.
centerEditorLayout
(
this
.
shouldCenterLayout
)));
this
.
_register
(
this
.
editorGroupService
.
onDidRemoveGroup
(()
=>
this
.
centerEditorLayout
(
this
.
shouldCenterLayout
)));
}
private
onFullscreenChanged
():
void
{
...
...
@@ -658,19 +662,30 @@ export class Workbench extends Disposable implements IPartService {
this
.
editorPart
.
whenRestored
.
then
(()
=>
updateEditorContextKeys
());
this
.
_register
(
this
.
editorService
.
onDidActiveEditorChange
(()
=>
updateEditorContextKeys
()));
this
.
_register
(
this
.
editorService
.
onDidVisibleEditorsChange
(()
=>
updateEditorContextKeys
()));
this
.
_register
(
this
.
editorGroupService
.
onDidAddGroup
(()
=>
{
updateEditorContextKeys
();
this
.
centerEditorLayout
(
this
.
shouldCenterLayout
);
}));
this
.
_register
(
this
.
editorGroupService
.
onDidRemoveGroup
(()
=>
{
updateEditorContextKeys
();
this
.
centerEditorLayout
(
this
.
shouldCenterLayout
);
}));
this
.
_register
(
this
.
editorGroupService
.
onDidAddGroup
(()
=>
updateEditorContextKeys
()));
this
.
_register
(
this
.
editorGroupService
.
onDidRemoveGroup
(()
=>
updateEditorContextKeys
()));
const
inputFocused
=
InputFocusedContext
.
bindTo
(
this
.
contextKeyService
);
this
.
_register
(
DOM
.
addDisposableListener
(
window
,
'
focusin
'
,
()
=>
{
inputFocused
.
set
(
document
.
activeElement
&&
(
document
.
activeElement
.
tagName
===
'
INPUT
'
||
document
.
activeElement
.
tagName
===
'
TEXTAREA
'
));
},
true
));
function
activeElementIsInput
():
boolean
{
return
document
.
activeElement
&&
(
document
.
activeElement
.
tagName
===
'
INPUT
'
||
document
.
activeElement
.
tagName
===
'
TEXTAREA
'
);
}
function
trackInputFocus
():
void
{
const
isInputFocused
=
activeElementIsInput
();
inputFocused
.
set
(
isInputFocused
);
if
(
isInputFocused
)
{
const
tracker
=
DOM
.
trackFocus
(
document
.
activeElement
as
HTMLElement
);
once
(
tracker
.
onDidBlur
)(()
=>
{
inputFocused
.
set
(
activeElementIsInput
());
tracker
.
dispose
();
});
}
}
this
.
_register
(
DOM
.
addDisposableListener
(
window
,
'
focusin
'
,
()
=>
trackInputFocus
(),
true
));
const
workbenchStateRawContext
=
new
RawContextKey
<
string
>
(
'
workbenchState
'
,
getWorkbenchStateString
(
this
.
configurationService
.
getWorkbenchState
()));
const
workbenchStateContext
=
workbenchStateRawContext
.
bindTo
(
this
.
contextKeyService
);
...
...
src/vs/workbench/parts/webview/electron-browser/webview.contribution.ts
浏览文件 @
05f3932a
...
...
@@ -20,6 +20,7 @@ import { HideWebViewEditorFindCommand, OpenWebviewDeveloperToolsAction, ReloadWe
import
{
WebviewEditor
}
from
'
./webviewEditor
'
;
import
{
WebviewEditorInput
}
from
'
./webviewEditorInput
'
;
import
{
IWebviewEditorService
,
WebviewEditorService
}
from
'
./webviewEditorService
'
;
import
{
InputFocusedContextKey
}
from
'
vs/platform/workbench/common/contextkeys
'
;
(
Registry
.
as
<
IEditorRegistry
>
(
EditorExtensions
.
Editors
)).
registerEditor
(
new
EditorDescriptor
(
WebviewEditor
,
...
...
@@ -65,7 +66,7 @@ export function registerWebViewCommands(editorId: string): void {
const
selectAllCommand
=
new
SelectAllWebviewEditorCommand
({
id
:
SelectAllWebviewEditorCommand
.
ID
,
precondition
:
contextKeyExpr
,
precondition
:
ContextKeyExpr
.
and
(
contextKeyExpr
,
ContextKeyExpr
.
not
(
InputFocusedContextKey
))
,
kbOpts
:
{
primary
:
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_A
,
weight
:
KeybindingWeight
.
EditorContrib
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录