Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
4d18e200
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
4d18e200
编写于
10月 26, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed render_error not being hooked up correctly
[ci skip]
上级
bdac5569
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
9 addition
and
34 deletion
+9
-34
app/assets/javascripts/repo/components/repo_preview.vue
app/assets/javascripts/repo/components/repo_preview.vue
+4
-4
app/assets/javascripts/repo/stores/getters.js
app/assets/javascripts/repo/stores/getters.js
+1
-1
app/assets/javascripts/repo/stores/mutations/file.js
app/assets/javascripts/repo/stores/mutations/file.js
+1
-0
app/assets/javascripts/repo/stores/utils.js
app/assets/javascripts/repo/stores/utils.js
+3
-0
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+0
-29
未找到文件。
app/assets/javascripts/repo/components/repo_preview.vue
浏览文件 @
4d18e200
...
...
@@ -33,21 +33,21 @@ export default {
<
template
>
<div>
<div
v-if=
"!activeFile.render
_e
rror"
v-if=
"!activeFile.render
E
rror"
v-html=
"activeFile.html"
>
</div>
<div
v-else-if=
"activeFile.
tooLarge
"
v-else-if=
"activeFile.
renderError == 'too_large'
"
class=
"vertical-center render-error"
>
<p
class=
"text-center"
>
The source could not be displayed because it is too large. You can
<a
:href=
"activeFile.raw
_path"
>
download
</a>
it instead.
The source could not be displayed because it is too large. You can
<a
:href=
"activeFile.raw
Path"
download
>
download
</a>
it instead.
</p>
</div>
<div
v-else
class=
"vertical-center render-error"
>
<p
class=
"text-center"
>
The source could not be displayed because a rendering error occurred. You can
<a
:href=
"activeFile.raw
_path"
>
download
</a>
it instead.
The source could not be displayed because a rendering error occurred. You can
<a
:href=
"activeFile.raw
Path"
download
>
download
</a>
it instead.
</p>
</div>
</div>
...
...
app/assets/javascripts/repo/stores/getters.js
浏览文件 @
4d18e200
...
...
@@ -35,5 +35,5 @@ export const canEditFile = (state) => {
return
state
.
canCommit
&&
state
.
onTopOfBranch
&&
openedFiles
.
length
&&
(
currentActiveFile
&&
!
currentActiveFile
.
render
_e
rror
&&
!
currentActiveFile
.
binary
);
(
currentActiveFile
&&
!
currentActiveFile
.
render
E
rror
&&
!
currentActiveFile
.
binary
);
};
app/assets/javascripts/repo/stores/mutations/file.js
浏览文件 @
4d18e200
...
...
@@ -26,6 +26,7 @@ export default {
rawPath
:
data
.
raw_path
,
binary
:
data
.
binary
,
html
:
data
.
html
,
renderError
:
data
.
render_error
,
});
},
[
types
.
SET_FILE_RAW_DATA
](
state
,
{
file
,
raw
})
{
...
...
app/assets/javascripts/repo/stores/utils.js
浏览文件 @
4d18e200
...
...
@@ -23,6 +23,7 @@ export const dataStructure = () => ({
raw
:
''
,
content
:
''
,
parentTreeUrl
:
''
,
renderError
:
false
,
});
export
const
decorateData
=
(
entity
,
projectUrl
=
''
)
=>
{
...
...
@@ -36,6 +37,7 @@ export const decorateData = (entity, projectUrl = '') => {
tree_url
,
path
,
tempFile
,
renderError
,
active
=
false
,
opened
=
false
,
changed
=
false
,
...
...
@@ -58,6 +60,7 @@ export const decorateData = (entity, projectUrl = '') => {
active
,
parentTreeUrl
,
changed
,
renderError
,
// eslint-disable-next-line camelcase
lastCommit
:
last_commit
?
{
url
:
`
${
projectUrl
}
/commit/
${
last_commit
.
id
}
`
,
...
...
app/assets/stylesheets/pages/repo.scss
浏览文件 @
4d18e200
.monaco-loader
{
position
:
absolute
;
top
:
0
;
left
:
0
;
right
:
0
;
bottom
:
0
;
background
:
$black-transparent
;
}
.modal.popup-dialog
{
display
:
block
;
background-color
:
$black-transparent
;
...
...
@@ -313,23 +304,3 @@
width
:
100%
;
}
}
@keyframes
swipeRightAppear
{
0
%
{
transform
:
scaleX
(
0
.00
);
}
100
%
{
transform
:
scaleX
(
1
.00
);
}
}
@keyframes
swipeRightDissapear
{
0
%
{
transform
:
scaleX
(
1
.00
);
}
100
%
{
transform
:
scaleX
(
0
.00
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录