Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
4d9fe432
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,发现更多精彩内容 >>
提交
4d9fe432
编写于
10月 21, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
send gallery requests for all URLs
fixes #14139
上级
657070a0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
26 addition
and
0 deletion
+26
-0
src/vs/code/electron-main/windows.ts
src/vs/code/electron-main/windows.ts
+14
-0
src/vs/platform/extensionManagement/common/extensionManagement.ts
...latform/extensionManagement/common/extensionManagement.ts
+1
-0
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
...tform/extensionManagement/node/extensionGalleryService.ts
+4
-0
src/vs/workbench/electron-browser/integration.ts
src/vs/workbench/electron-browser/integration.ts
+7
-0
未找到文件。
src/vs/code/electron-main/windows.ts
浏览文件 @
4d9fe432
...
...
@@ -422,6 +422,20 @@ export class WindowsManager implements IWindowsService {
}
});
ipc
.
on
(
'
vscode:setHeaders
'
,
(
event
,
windowId
:
number
,
urls
:
string
[],
headers
:
any
)
=>
{
this
.
logService
.
log
(
'
IPC#vscode:setHeaders
'
);
const
vscodeWindow
=
this
.
getWindowById
(
windowId
);
if
(
!
vscodeWindow
||
!
urls
||
!
urls
.
length
||
!
headers
)
{
return
;
}
vscodeWindow
.
win
.
webContents
.
session
.
webRequest
.
onBeforeSendHeaders
({
urls
},
(
details
,
cb
)
=>
{
cb
({
cancel
:
false
,
requestHeaders
:
assign
(
details
.
requestHeaders
,
headers
)
});
});
});
ipc
.
on
(
'
vscode:broadcast
'
,
(
event
,
windowId
:
number
,
target
:
string
,
broadcast
:
{
channel
:
string
;
payload
:
any
;
})
=>
{
if
(
broadcast
.
channel
&&
!
types
.
isUndefinedOrNull
(
broadcast
.
payload
))
{
this
.
logService
.
log
(
'
IPC#vscode:broadcast
'
,
target
,
broadcast
.
channel
,
broadcast
.
payload
);
...
...
src/vs/platform/extensionManagement/common/extensionManagement.ts
浏览文件 @
4d9fe432
...
...
@@ -191,6 +191,7 @@ export interface IQueryOptions {
export
interface
IExtensionGalleryService
{
_serviceBrand
:
any
;
isEnabled
():
boolean
;
getRequestHeaders
():
TPromise
<
{
[
key
:
string
]:
string
;
}
>
;
query
(
options
?:
IQueryOptions
):
TPromise
<
IPager
<
IGalleryExtension
>>
;
download
(
extension
:
IGalleryExtension
):
TPromise
<
string
>
;
getAsset
(
url
:
string
):
TPromise
<
IRequestContext
>
;
...
...
src/vs/platform/extensionManagement/node/extensionGalleryService.ts
浏览文件 @
4d9fe432
...
...
@@ -293,6 +293,10 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
return
!!
this
.
extensionsGalleryUrl
;
}
getRequestHeaders
():
TPromise
<
{
[
key
:
string
]:
string
;
}
>
{
return
this
.
commonHeaders
;
}
query
(
options
:
IQueryOptions
=
{}):
TPromise
<
IPager
<
IGalleryExtension
>>
{
if
(
!
this
.
isEnabled
())
{
return
TPromise
.
wrapError
(
new
Error
(
'
No extension gallery service configured.
'
));
...
...
src/vs/workbench/electron-browser/integration.ts
浏览文件 @
4d9fe432
...
...
@@ -34,6 +34,7 @@ import { IPath, IOpenFileRequest, IWindowConfiguration } from 'vs/workbench/elec
import
{
IResourceInput
}
from
'
vs/platform/editor/common/editor
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IUntitledEditorService
}
from
'
vs/workbench/services/untitled/common/untitledEditorService
'
;
import
{
IExtensionGalleryService
}
from
'
vs/platform/extensionManagement/common/extensionManagement
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
ipcRenderer
as
ipc
,
webFrame
,
remote
}
from
'
electron
'
;
...
...
@@ -68,6 +69,7 @@ export class ElectronIntegration {
@
IMessageService
private
messageService
:
IMessageService
,
@
IContextMenuService
private
contextMenuService
:
IContextMenuService
,
@
IWorkbenchEditorService
private
editorService
:
IWorkbenchEditorService
,
@
IExtensionGalleryService
private
extensionGalleryService
:
IExtensionGalleryService
,
@
IUntitledEditorService
private
untitledEditorService
:
IUntitledEditorService
)
{
}
...
...
@@ -192,6 +194,11 @@ export class ElectronIntegration {
}
}
});
this
.
extensionGalleryService
.
getRequestHeaders
().
done
(
headers
=>
{
const
urls
=
[
'
https://marketplace.visualstudio.com/*
'
,
'
https://*.vsassets.io/*
'
];
ipc
.
send
(
'
vscode:setHeaders
'
,
this
.
windowService
.
getWindowId
(),
urls
,
headers
);
});
}
private
resolveKeybindings
(
actionIds
:
string
[]):
TPromise
<
{
id
:
string
;
binding
:
number
;
}[]
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录