Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f93f19d2
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,发现更多精彩内容 >>
提交
f93f19d2
编写于
9月 11, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Enable/disable webview find buttons based on if results have been found
Fixes #80656
上级
ad5e8204
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
8 deletion
+23
-8
src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
...bench/contrib/codeEditor/browser/find/simpleFindWidget.ts
+8
-8
src/vs/workbench/contrib/webview/browser/webviewFindWidget.ts
...vs/workbench/contrib/webview/browser/webviewFindWidget.ts
+6
-0
src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
...kbench/contrib/webview/electron-browser/webviewElement.ts
+9
-0
未找到文件。
src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.ts
浏览文件 @
f93f19d2
...
@@ -59,7 +59,7 @@ export abstract class SimpleFindWidget extends Widget {
...
@@ -59,7 +59,7 @@ export abstract class SimpleFindWidget extends Widget {
return
null
;
return
null
;
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
foundMatch
=
false
;
this
.
foundMatch
=
false
;
this
.
_updateButtons
(
);
this
.
updateButtons
(
this
.
foundMatch
);
return
{
content
:
e
.
message
};
return
{
content
:
e
.
message
};
}
}
}
}
...
@@ -70,7 +70,7 @@ export abstract class SimpleFindWidget extends Widget {
...
@@ -70,7 +70,7 @@ export abstract class SimpleFindWidget extends Widget {
this
.
oninput
(
this
.
_findInput
.
domNode
,
(
e
)
=>
{
this
.
oninput
(
this
.
_findInput
.
domNode
,
(
e
)
=>
{
this
.
foundMatch
=
this
.
onInputChanged
();
this
.
foundMatch
=
this
.
onInputChanged
();
this
.
_updateButtons
(
);
this
.
updateButtons
(
this
.
foundMatch
);
this
.
_delayedUpdateHistory
();
this
.
_delayedUpdateHistory
();
});
});
...
@@ -209,7 +209,7 @@ export abstract class SimpleFindWidget extends Widget {
...
@@ -209,7 +209,7 @@ export abstract class SimpleFindWidget extends Widget {
}
}
this
.
_isVisible
=
true
;
this
.
_isVisible
=
true
;
this
.
_updateButtons
(
);
this
.
updateButtons
(
this
.
foundMatch
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
dom
.
addClass
(
this
.
_innerDomNode
,
'
visible
'
);
dom
.
addClass
(
this
.
_innerDomNode
,
'
visible
'
);
...
@@ -240,7 +240,7 @@ export abstract class SimpleFindWidget extends Widget {
...
@@ -240,7 +240,7 @@ export abstract class SimpleFindWidget extends Widget {
// Need to delay toggling visibility until after Transition, then visibility hidden - removes from tabIndex list
// Need to delay toggling visibility until after Transition, then visibility hidden - removes from tabIndex list
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
_isVisible
=
false
;
this
.
_isVisible
=
false
;
this
.
_updateButtons
(
);
this
.
updateButtons
(
this
.
foundMatch
);
dom
.
removeClass
(
this
.
_innerDomNode
,
'
visible
'
);
dom
.
removeClass
(
this
.
_innerDomNode
,
'
visible
'
);
},
200
);
},
200
);
}
}
...
@@ -266,10 +266,10 @@ export abstract class SimpleFindWidget extends Widget {
...
@@ -266,10 +266,10 @@ export abstract class SimpleFindWidget extends Widget {
return
this
.
_findInput
.
getCaseSensitive
();
return
this
.
_findInput
.
getCaseSensitive
();
}
}
pr
ivate
_updateButtons
(
)
{
pr
otected
updateButtons
(
foundMatch
:
boolean
)
{
le
t
hasInput
=
this
.
inputValue
.
length
>
0
;
cons
t
hasInput
=
this
.
inputValue
.
length
>
0
;
this
.
prevBtn
.
setEnabled
(
this
.
_isVisible
&&
hasInput
&&
this
.
foundMatch
);
this
.
prevBtn
.
setEnabled
(
this
.
_isVisible
&&
hasInput
&&
foundMatch
);
this
.
nextBtn
.
setEnabled
(
this
.
_isVisible
&&
hasInput
&&
this
.
foundMatch
);
this
.
nextBtn
.
setEnabled
(
this
.
_isVisible
&&
hasInput
&&
foundMatch
);
}
}
}
}
...
...
src/vs/workbench/contrib/webview/browser/webviewFindWidget.ts
浏览文件 @
f93f19d2
...
@@ -7,8 +7,10 @@ import { SimpleFindWidget } from 'vs/workbench/contrib/codeEditor/browser/find/s
...
@@ -7,8 +7,10 @@ import { SimpleFindWidget } from 'vs/workbench/contrib/codeEditor/browser/find/s
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextKeyService
,
IContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
}
from
'
vs/workbench/contrib/webview/browser/webview
'
;
import
{
KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
}
from
'
vs/workbench/contrib/webview/browser/webview
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
export
interface
WebviewFindDelegate
{
export
interface
WebviewFindDelegate
{
readonly
hasFindResult
:
Event
<
boolean
>
;
find
(
value
:
string
,
previous
:
boolean
):
void
;
find
(
value
:
string
,
previous
:
boolean
):
void
;
startFind
(
value
:
string
):
void
;
startFind
(
value
:
string
):
void
;
stopFind
(
keepSelection
?:
boolean
):
void
;
stopFind
(
keepSelection
?:
boolean
):
void
;
...
@@ -25,6 +27,10 @@ export class WebviewFindWidget extends SimpleFindWidget {
...
@@ -25,6 +27,10 @@ export class WebviewFindWidget extends SimpleFindWidget {
)
{
)
{
super
(
contextViewService
,
contextKeyService
);
super
(
contextViewService
,
contextKeyService
);
this
.
_findWidgetFocused
=
KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
.
bindTo
(
contextKeyService
);
this
.
_findWidgetFocused
=
KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED
.
bindTo
(
contextKeyService
);
this
.
_register
(
_delegate
.
hasFindResult
(
hasResult
=>
{
this
.
updateButtons
(
hasResult
);
}));
}
}
public
find
(
previous
:
boolean
)
{
public
find
(
previous
:
boolean
)
{
...
...
src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
浏览文件 @
f93f19d2
...
@@ -377,12 +377,17 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
...
@@ -377,12 +377,17 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
return
;
return
;
}
}
}));
}));
this
.
_register
(
addDisposableListener
(
this
.
_webview
,
'
devtools-opened
'
,
()
=>
{
this
.
_register
(
addDisposableListener
(
this
.
_webview
,
'
devtools-opened
'
,
()
=>
{
this
.
_send
(
'
devtools-opened
'
);
this
.
_send
(
'
devtools-opened
'
);
}));
}));
if
(
_options
.
enableFindWidget
)
{
if
(
_options
.
enableFindWidget
)
{
this
.
_webviewFindWidget
=
this
.
_register
(
instantiationService
.
createInstance
(
WebviewFindWidget
,
this
));
this
.
_webviewFindWidget
=
this
.
_register
(
instantiationService
.
createInstance
(
WebviewFindWidget
,
this
));
this
.
_register
(
addDisposableListener
(
this
.
_webview
,
'
found-in-page
'
,
e
=>
{
this
.
_hasFindResult
.
fire
(
e
.
result
.
matches
>
0
);
}));
}
}
this
.
style
(
themeService
.
getTheme
());
this
.
style
(
themeService
.
getTheme
());
...
@@ -576,6 +581,9 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
...
@@ -576,6 +581,9 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
});
});
}
}
private
readonly
_hasFindResult
=
this
.
_register
(
new
Emitter
<
boolean
>
());
public
readonly
hasFindResult
:
Event
<
boolean
>
=
this
.
_hasFindResult
.
event
;
public
startFind
(
value
:
string
,
options
?:
Electron
.
FindInPageOptions
)
{
public
startFind
(
value
:
string
,
options
?:
Electron
.
FindInPageOptions
)
{
if
(
!
value
||
!
this
.
_webview
)
{
if
(
!
value
||
!
this
.
_webview
)
{
return
;
return
;
...
@@ -623,6 +631,7 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
...
@@ -623,6 +631,7 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview,
}
}
public
stopFind
(
keepSelection
?:
boolean
):
void
{
public
stopFind
(
keepSelection
?:
boolean
):
void
{
this
.
_hasFindResult
.
fire
(
false
);
if
(
!
this
.
_webview
)
{
if
(
!
this
.
_webview
)
{
return
;
return
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录