Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
82d97b4c
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,发现更多精彩内容 >>
提交
82d97b4c
编写于
4月 25, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add acquireVsCodeApi to get handle to vscode api inside webview
Fixes #48540
上级
6d7bb1a1
变更
8
展开全部
显示空白变更内容
内联
并排
Showing
8 changed file
with
153 addition
and
116 deletion
+153
-116
extensions/markdown-language-features/media/index.js
extensions/markdown-language-features/media/index.js
+25
-25
extensions/markdown-language-features/media/pre.js
extensions/markdown-language-features/media/pre.js
+29
-53
extensions/markdown-language-features/preview-src/csp.ts
extensions/markdown-language-features/preview-src/csp.ts
+20
-5
extensions/markdown-language-features/preview-src/index.ts
extensions/markdown-language-features/preview-src/index.ts
+16
-6
extensions/markdown-language-features/preview-src/loading.ts
extensions/markdown-language-features/preview-src/loading.ts
+15
-2
extensions/markdown-language-features/preview-src/messaging.ts
...sions/markdown-language-features/preview-src/messaging.ts
+25
-16
extensions/markdown-language-features/preview-src/pre.ts
extensions/markdown-language-features/preview-src/pre.ts
+8
-4
src/vs/workbench/parts/webview/electron-browser/webview-pre.js
...s/workbench/parts/webview/electron-browser/webview-pre.js
+15
-5
未找到文件。
extensions/markdown-language-features/media/index.js
浏览文件 @
82d97b4c
此差异已折叠。
点击以展开。
extensions/markdown-language-features/media/pre.js
浏览文件 @
82d97b4c
此差异已折叠。
点击以展开。
extensions/markdown-language-features/preview-src/csp.ts
浏览文件 @
82d97b4c
...
...
@@ -3,33 +3,48 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
MessagePoster
}
from
'
./messaging
'
;
import
{
getSettings
}
from
'
./settings
'
;
import
{
getStrings
}
from
'
./strings
'
;
import
{
postCommand
}
from
'
./messaging
'
;
/**
* Shows an alert when there is a content security policy violation.
*/
export
class
CspAlerter
{
private
didShow
=
false
;
private
didHaveCspWarning
=
false
;
private
messaging
?:
MessagePoster
;
constructor
()
{
document
.
addEventListener
(
'
securitypolicyviolation
'
,
()
=>
{
this
.
show
CspWarning
();
this
.
on
CspWarning
();
});
window
.
addEventListener
(
'
message
'
,
(
event
)
=>
{
if
(
event
&&
event
.
data
&&
event
.
data
.
name
===
'
vscode-did-block-svg
'
)
{
this
.
show
CspWarning
();
this
.
on
CspWarning
();
}
});
}
public
setPoster
(
poster
:
MessagePoster
)
{
this
.
messaging
=
poster
;
if
(
this
.
didHaveCspWarning
)
{
this
.
showCspWarning
();
}
}
private
onCspWarning
()
{
this
.
didHaveCspWarning
=
true
;
this
.
showCspWarning
();
}
private
showCspWarning
()
{
const
strings
=
getStrings
();
const
settings
=
getSettings
();
if
(
this
.
didShow
||
settings
.
disableSecurityWarnings
)
{
if
(
this
.
didShow
||
settings
.
disableSecurityWarnings
||
!
this
.
messaging
)
{
return
;
}
this
.
didShow
=
true
;
...
...
@@ -42,7 +57,7 @@ export class CspAlerter {
notification
.
setAttribute
(
'
role
'
,
'
button
'
);
notification
.
setAttribute
(
'
aria-label
'
,
strings
.
cspAlertMessageLabel
);
notification
.
onclick
=
()
=>
{
postCommand
(
'
markdown.showPreviewSecuritySelector
'
,
[
settings
.
source
]);
this
.
messaging
!
.
postCommand
(
'
markdown.showPreviewSecuritySelector
'
,
[
settings
.
source
]);
};
document
.
body
.
appendChild
(
notification
);
}
...
...
extensions/markdown-language-features/preview-src/index.ts
浏览文件 @
82d97b4c
...
...
@@ -3,17 +3,27 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
getSettings
}
from
'
./settings
'
;
import
{
postCommand
,
postMessage
}
from
'
./messaging
'
;
import
{
ActiveLineMarker
}
from
'
./activeLineMarker
'
;
import
{
onceDocumentLoaded
}
from
'
./events
'
;
import
{
createPosterForVsCode
}
from
'
./messaging
'
;
import
{
getEditorLineNumberForPageOffset
,
scrollToRevealSourceLine
}
from
'
./scroll-sync
'
;
import
{
ActiveLineMarker
}
from
'
./activeLineMarker
'
;
import
{
getSettings
}
from
'
./settings
'
;
import
throttle
=
require
(
'
lodash.throttle
'
);
declare
var
acquireVsCodeApi
:
any
;
var
scrollDisabled
=
true
;
const
marker
=
new
ActiveLineMarker
();
const
settings
=
getSettings
();
const
vscode
=
acquireVsCodeApi
();
vscode
.
postMessage
({});
const
messaging
=
createPosterForVsCode
(
vscode
);
window
.
cspAlerter
.
setPoster
(
messaging
);
window
.
styleLoadingMonitor
.
setPoster
(
messaging
);
onceDocumentLoaded
(()
=>
{
if
(
settings
.
scrollPreviewWithEditor
)
{
setTimeout
(()
=>
{
...
...
@@ -75,7 +85,7 @@ document.addEventListener('dblclick', event => {
const
offset
=
event
.
pageY
;
const
line
=
getEditorLineNumberForPageOffset
(
offset
);
if
(
typeof
line
===
'
number
'
&&
!
isNaN
(
line
))
{
postMessage
(
'
didClick
'
,
{
line
:
Math
.
floor
(
line
)
});
messaging
.
postMessage
(
'
didClick
'
,
{
line
:
Math
.
floor
(
line
)
});
}
});
...
...
@@ -92,7 +102,7 @@ document.addEventListener('click', event => {
}
if
(
node
.
href
.
startsWith
(
'
file://
'
)
||
node
.
href
.
startsWith
(
'
vscode-resource:
'
))
{
const
[
path
,
fragment
]
=
node
.
href
.
replace
(
/^
(
file:
\/\/
|vscode-resource:
)
/i
,
''
).
split
(
'
#
'
);
postCommand
(
'
_markdown.openDocumentLink
'
,
[{
path
,
fragment
}]);
messaging
.
postCommand
(
'
_markdown.openDocumentLink
'
,
[{
path
,
fragment
}]);
event
.
preventDefault
();
event
.
stopPropagation
();
break
;
...
...
@@ -110,7 +120,7 @@ if (settings.scrollEditorWithPreview) {
}
else
{
const
line
=
getEditorLineNumberForPageOffset
(
window
.
scrollY
);
if
(
typeof
line
===
'
number
'
&&
!
isNaN
(
line
))
{
postMessage
(
'
revealLine
'
,
{
line
});
messaging
.
postMessage
(
'
revealLine
'
,
{
line
});
}
}
},
50
));
...
...
extensions/markdown-language-features/preview-src/loading.ts
浏览文件 @
82d97b4c
...
...
@@ -2,10 +2,13 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
postCommand
}
from
'
./messaging
'
;
import
{
MessagePoster
}
from
'
./messaging
'
;
export
class
StyleLoadingMonitor
{
private
unloadedStyles
:
string
[]
=
[];
private
finishedLoading
:
boolean
=
false
;
private
poster
?:
MessagePoster
;
constructor
()
{
const
onStyleLoadError
=
(
event
:
any
)
=>
{
...
...
@@ -25,7 +28,17 @@ export class StyleLoadingMonitor {
if
(
!
this
.
unloadedStyles
.
length
)
{
return
;
}
postCommand
(
'
_markdown.onPreviewStyleLoadError
'
,
[
this
.
unloadedStyles
]);
this
.
finishedLoading
=
true
;
if
(
this
.
poster
)
{
this
.
poster
.
postCommand
(
'
_markdown.onPreviewStyleLoadError
'
,
[
this
.
unloadedStyles
]);
}
});
}
public
setPoster
(
poster
:
MessagePoster
):
void
{
this
.
poster
=
poster
;
if
(
this
.
finishedLoading
)
{
poster
.
postCommand
(
'
_markdown.onPreviewStyleLoadError
'
,
[
this
.
unloadedStyles
]);
}
}
}
\ No newline at end of file
extensions/markdown-language-features/preview-src/messaging.ts
浏览文件 @
82d97b4c
...
...
@@ -5,22 +5,31 @@
import
{
getSettings
}
from
'
./settings
'
;
declare
var
vscode
:
any
;
/**
export
interface
MessagePoster
{
/**
* Post a message to the markdown extension
*/
export
function
postMessage
(
type
:
string
,
body
:
object
)
{
postMessage
(
type
:
string
,
body
:
object
):
void
;
/**
* Post a command to be executed to the markdown extension
*/
postCommand
(
command
:
string
,
args
:
any
[]):
void
;
}
export
const
createPosterForVsCode
=
(
vscode
:
any
)
=>
{
return
new
class
implements
MessagePoster
{
postMessage
(
type
:
string
,
body
:
object
):
void
{
vscode
.
postMessage
({
type
,
source
:
getSettings
().
source
,
body
});
}
}
postCommand
(
command
:
string
,
args
:
any
[])
{
this
.
postMessage
(
'
command
'
,
{
command
,
args
});
}
};
};
/**
* Post a command to be executed to the markdown extension
*/
export
function
postCommand
(
command
:
string
,
args
:
any
[])
{
postMessage
(
'
command
'
,
{
command
,
args
});
}
extensions/markdown-language-features/preview-src/pre.ts
浏览文件 @
82d97b4c
...
...
@@ -6,8 +6,12 @@
import
{
CspAlerter
}
from
'
./csp
'
;
import
{
StyleLoadingMonitor
}
from
'
./loading
'
;
// tslint:disable-next-line:no-unused-expression
new
CspAlerter
();
declare
global
{
interface
Window
{
cspAlerter
:
CspAlerter
;
styleLoadingMonitor
:
StyleLoadingMonitor
;
}
}
// tslint:disable-next-line:no-unused-expression
new
StyleLoadingMonitor
();
\ No newline at end of file
window
.
cspAlerter
=
new
CspAlerter
();
window
.
styleLoadingMonitor
=
new
StyleLoadingMonitor
();
\ No newline at end of file
src/vs/workbench/parts/webview/electron-browser/webview-pre.js
浏览文件 @
82d97b4c
...
...
@@ -178,15 +178,25 @@
if
(
enableWrappedPostMessage
)
{
const
defaultScript
=
newDocument
.
createElement
(
'
script
'
);
defaultScript
.
textContent
=
`
const
vscode = Object.freeze(
(function() {
const
acquireVsCodeApi =
(function() {
const originalPostMessage = window.parent.postMessage.bind(window.parent);
return {
let acquired = false;
return () => {
if (acquired) {
throw new Error('An instance of the VS Code API has already been acquired');
}
acquired = true;
return Object.freeze({
postMessage: function(msg) {
return originalPostMessage(msg, '*');
}
});
};
})()
)
;
})();
delete window.parent;
delete window.top;
delete window.frameElement;
`
;
if
(
newDocument
.
head
.
hasChildNodes
())
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录