Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
10dcaea1
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
10dcaea1
编写于
10月 19, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
failing spec fixes
上级
389c852d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
42 addition
and
47 deletion
+42
-47
app/assets/javascripts/repo/components/new_dropdown/modal.vue
...assets/javascripts/repo/components/new_dropdown/modal.vue
+3
-1
app/assets/javascripts/repo/components/repo_editor.vue
app/assets/javascripts/repo/components/repo_editor.vue
+18
-25
app/assets/javascripts/repo/helpers/repo_helper.js
app/assets/javascripts/repo/helpers/repo_helper.js
+1
-1
app/assets/javascripts/repo/services/repo_service.js
app/assets/javascripts/repo/services/repo_service.js
+8
-2
app/assets/javascripts/repo/stores/repo_store.js
app/assets/javascripts/repo/stores/repo_store.js
+1
-1
spec/javascripts/repo/components/repo_file_buttons_spec.js
spec/javascripts/repo/components/repo_file_buttons_spec.js
+11
-17
未找到文件。
app/assets/javascripts/repo/components/new_dropdown/modal.vue
浏览文件 @
10dcaea1
...
...
@@ -13,7 +13,7 @@
},
data
()
{
return
{
entryName
:
''
,
entryName
:
RepoStore
.
path
!==
''
?
`
${
RepoStore
.
path
}
/`
:
''
,
};
},
components
:
{
...
...
@@ -30,6 +30,8 @@
const
dirNames
=
this
.
entryName
.
split
(
'
/
'
);
dirNames
.
forEach
((
dirName
)
=>
{
if
(
dirName
===
''
)
return
;
tree
=
RepoHelper
.
findOrCreateEntry
(
'
tree
'
,
tree
,
dirName
).
entry
;
});
}
...
...
app/assets/javascripts/repo/components/repo_editor.vue
浏览文件 @
10dcaea1
...
...
@@ -16,35 +16,28 @@ const RepoEditor = {
},
mounted
()
{
if
(
!
this
.
activeFile
.
tempFile
)
{
Service
.
getRaw
(
this
.
activeFile
.
raw_path
)
.
then
((
rawResponse
)
=>
{
Store
.
blobRaw
=
rawResponse
.
data
;
Store
.
activeFile
.
plain
=
rawResponse
.
data
;
this
.
createMonacoInstance
();
})
.
catch
(
Helper
.
loadingError
);
}
else
{
this
.
createMonacoInstance
();
}
},
Service
.
getRaw
(
this
.
activeFile
)
.
then
((
rawResponse
)
=>
{
Store
.
blobRaw
=
rawResponse
.
data
;
Store
.
activeFile
.
plain
=
rawResponse
.
data
;
const
monacoInstance
=
Helper
.
monaco
.
editor
.
create
(
this
.
$el
,
{
model
:
null
,
readOnly
:
false
,
contextmenu
:
true
,
scrollBeyondLastLine
:
false
,
});
methods
:
{
createMonacoInstance
()
{
const
monacoInstance
=
Helper
.
monaco
.
editor
.
create
(
this
.
$el
,
{
model
:
null
,
readOnly
:
false
,
contextmenu
:
true
,
scrollBeyondLastLine
:
false
,
});
Helper
.
monacoInstance
=
monacoInstance
;
Helper
.
monacoInstance
=
monacoInstance
;
this
.
addMonacoEvents
()
;
this
.
addMonacoEvents
();
this
.
setupEditor
();
})
.
catch
(
Helper
.
loadingError
);
},
this
.
setupEditor
();
},
methods
:
{
setupEditor
()
{
this
.
showHide
();
...
...
app/assets/javascripts/repo/helpers/repo_helper.js
浏览文件 @
10dcaea1
...
...
@@ -110,7 +110,7 @@ const RepoHelper = {
RepoHelper
.
setBinaryDataAsBase64
(
data
);
Store
.
setViewToPreview
();
}
else
if
(
!
Store
.
isPreviewView
()
&&
!
data
.
render_error
)
{
Service
.
getRaw
(
data
.
raw_path
)
Service
.
getRaw
(
data
)
.
then
((
rawResponse
)
=>
{
Store
.
blobRaw
=
rawResponse
.
data
;
data
.
plain
=
rawResponse
.
data
;
...
...
app/assets/javascripts/repo/services/repo_service.js
浏览文件 @
10dcaea1
...
...
@@ -12,8 +12,14 @@ const RepoService = {
},
richExtensionRegExp
:
/md/
,
getRaw
(
url
)
{
return
axios
.
get
(
url
,
{
getRaw
(
file
)
{
if
(
file
.
tempFile
)
{
return
Promise
.
resolve
({
data
:
''
,
});
}
return
axios
.
get
(
file
.
raw_path
,
{
// Stop Axios from parsing a JSON file into a JS object
transformResponse
:
[
res
=>
res
],
});
...
...
app/assets/javascripts/repo/stores/repo_store.js
浏览文件 @
10dcaea1
...
...
@@ -77,7 +77,7 @@ const RepoStore = {
}
else
if
(
file
.
newContent
||
file
.
plain
)
{
RepoStore
.
blobRaw
=
file
.
newContent
||
file
.
plain
;
}
else
if
(
!
file
.
tempFile
)
{
Service
.
getRaw
(
file
.
raw_path
)
Service
.
getRaw
(
file
)
.
then
((
rawResponse
)
=>
{
RepoStore
.
blobRaw
=
rawResponse
.
data
;
Helper
.
findOpenedFileFromActive
().
plain
=
rawResponse
.
data
;
...
...
spec/javascripts/repo/components/repo_file_buttons_spec.js
浏览文件 @
10dcaea1
...
...
@@ -2,7 +2,16 @@ import Vue from 'vue';
import
repoFileButtons
from
'
~/repo/components/repo_file_buttons.vue
'
;
import
RepoStore
from
'
~/repo/stores/repo_store
'
;
describe
(
'
RepoFileButtons
'
,
()
=>
{
fdescribe
(
'
RepoFileButtons
'
,
()
=>
{
const
activeFile
=
{
extension
:
'
md
'
,
url
:
'
url
'
,
raw_path
:
'
raw_path
'
,
blame_path
:
'
blame_path
'
,
commits_path
:
'
commits_path
'
,
permalink
:
'
permalink
'
,
};
function
createComponent
()
{
const
RepoFileButtons
=
Vue
.
extend
(
repoFileButtons
);
...
...
@@ -14,14 +23,6 @@ describe('RepoFileButtons', () => {
});
it
(
'
renders Raw, Blame, History, Permalink and Preview toggle
'
,
()
=>
{
const
activeFile
=
{
extension
:
'
md
'
,
url
:
'
url
'
,
raw_path
:
'
raw_path
'
,
blame_path
:
'
blame_path
'
,
commits_path
:
'
commits_path
'
,
permalink
:
'
permalink
'
,
};
const
activeFileLabel
=
'
activeFileLabel
'
;
RepoStore
.
openedFiles
=
new
Array
(
1
);
RepoStore
.
activeFile
=
activeFile
;
...
...
@@ -46,10 +47,6 @@ describe('RepoFileButtons', () => {
});
it
(
'
triggers rawPreviewToggle on preview click
'
,
()
=>
{
const
activeFile
=
{
extension
:
'
md
'
,
url
:
'
url
'
,
};
RepoStore
.
openedFiles
=
new
Array
(
1
);
RepoStore
.
activeFile
=
activeFile
;
RepoStore
.
editMode
=
true
;
...
...
@@ -65,10 +62,7 @@ describe('RepoFileButtons', () => {
});
it
(
'
does not render preview toggle if not canPreview
'
,
()
=>
{
const
activeFile
=
{
extension
:
'
abcd
'
,
url
:
'
url
'
,
};
activeFile
.
extension
=
'
js
'
;
RepoStore
.
openedFiles
=
new
Array
(
1
);
RepoStore
.
activeFile
=
activeFile
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录