Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f87996af
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,发现更多精彩内容 >>
提交
f87996af
编写于
12月 08, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #11012: Some dependencies to window from common
上级
4726bd3d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
src/vs/base/common/worker/simpleWorker.ts
src/vs/base/common/worker/simpleWorker.ts
+3
-3
src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
.../editor/contrib/wordHighlighter/common/wordHighlighter.ts
+3
-3
未找到文件。
src/vs/base/common/worker/simpleWorker.ts
浏览文件 @
f87996af
...
@@ -221,13 +221,13 @@ export class SimpleWorkerClient<T> extends Disposable {
...
@@ -221,13 +221,13 @@ export class SimpleWorkerClient<T> extends Disposable {
// Gather loader configuration
// Gather loader configuration
let
loaderConfiguration
:
any
=
null
;
let
loaderConfiguration
:
any
=
null
;
let
globalRequire
=
(
<
any
>
window
).
require
;
let
globalRequire
=
(
<
any
>
self
).
require
;
if
(
typeof
globalRequire
.
getConfig
===
'
function
'
)
{
if
(
typeof
globalRequire
.
getConfig
===
'
function
'
)
{
// Get the configuration from the Monaco AMD Loader
// Get the configuration from the Monaco AMD Loader
loaderConfiguration
=
globalRequire
.
getConfig
();
loaderConfiguration
=
globalRequire
.
getConfig
();
}
else
if
(
typeof
(
<
any
>
window
).
requirejs
!==
'
undefined
'
)
{
}
else
if
(
typeof
(
<
any
>
self
).
requirejs
!==
'
undefined
'
)
{
// Get the configuration from requirejs
// Get the configuration from requirejs
loaderConfiguration
=
(
<
any
>
window
).
requirejs
.
s
.
contexts
.
_
.
config
;
loaderConfiguration
=
(
<
any
>
self
).
requirejs
.
s
.
contexts
.
_
.
config
;
}
}
this
.
_lazyProxy
=
new
TPromise
((
c
,
e
,
p
)
=>
{
this
.
_lazyProxy
=
new
TPromise
((
c
,
e
,
p
)
=>
{
...
...
src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts
浏览文件 @
f87996af
...
@@ -100,7 +100,7 @@ class WordHighlighter {
...
@@ -100,7 +100,7 @@ class WordHighlighter {
// Cancel any renderDecorationsTimer
// Cancel any renderDecorationsTimer
if
(
this
.
renderDecorationsTimer
!==
-
1
)
{
if
(
this
.
renderDecorationsTimer
!==
-
1
)
{
window
.
clearTimeout
(
this
.
renderDecorationsTimer
);
clearTimeout
(
this
.
renderDecorationsTimer
);
this
.
renderDecorationsTimer
=
-
1
;
this
.
renderDecorationsTimer
=
-
1
;
}
}
...
@@ -190,7 +190,7 @@ class WordHighlighter {
...
@@ -190,7 +190,7 @@ class WordHighlighter {
if
(
this
.
workerRequestCompleted
&&
this
.
renderDecorationsTimer
!==
-
1
)
{
if
(
this
.
workerRequestCompleted
&&
this
.
renderDecorationsTimer
!==
-
1
)
{
// case b)
// case b)
// Delay the firing of renderDecorationsTimer by an extra 250 ms
// Delay the firing of renderDecorationsTimer by an extra 250 ms
window
.
clearTimeout
(
this
.
renderDecorationsTimer
);
clearTimeout
(
this
.
renderDecorationsTimer
);
this
.
renderDecorationsTimer
=
-
1
;
this
.
renderDecorationsTimer
=
-
1
;
this
.
_beginRenderDecorations
();
this
.
_beginRenderDecorations
();
}
}
...
@@ -226,7 +226,7 @@ class WordHighlighter {
...
@@ -226,7 +226,7 @@ class WordHighlighter {
this
.
renderDecorations
();
this
.
renderDecorations
();
}
else
{
}
else
{
// Asyncrhonous
// Asyncrhonous
this
.
renderDecorationsTimer
=
window
.
setTimeout
(()
=>
{
this
.
renderDecorationsTimer
=
setTimeout
(()
=>
{
this
.
renderDecorations
();
this
.
renderDecorations
();
},
(
minimumRenderTime
-
currentTime
));
},
(
minimumRenderTime
-
currentTime
));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录