Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f09f7539
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,发现更多精彩内容 >>
提交
f09f7539
编写于
4月 20, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'environments-vue-2' into 'master'
Refactor into .vue files part 2 See merge request !10791
上级
08b2e7cd
324aa141
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
71 addition
and
29 deletion
+71
-29
app/assets/javascripts/environments/components/environment_external_url.vue
...ipts/environments/components/environment_external_url.vue
+33
-0
app/assets/javascripts/environments/components/environment_item.js
...s/javascripts/environments/components/environment_item.js
+3
-3
app/assets/javascripts/environments/components/environment_stop.vue
.../javascripts/environments/components/environment_stop.vue
+20
-13
app/assets/javascripts/environments/components/environment_terminal_button.vue
...s/environments/components/environment_terminal_button.vue
+12
-10
spec/javascripts/environments/environment_external_url_spec.js
...javascripts/environments/environment_external_url_spec.js
+1
-1
spec/javascripts/environments/environment_stop_spec.js
spec/javascripts/environments/environment_stop_spec.js
+1
-1
spec/javascripts/environments/environment_terminal_button_spec.js
...ascripts/environments/environment_terminal_button_spec.js
+1
-1
未找到文件。
app/assets/javascripts/environments/components/environment_external_url.
js
→
app/assets/javascripts/environments/components/environment_external_url.
vue
浏览文件 @
f09f7539
<
script
>
/**
* Renders the external url link in environments table.
*/
...
...
@@ -5,7 +6,7 @@ export default {
props
:
{
externalUrl
:
{
type
:
String
,
default
:
''
,
required
:
true
,
},
},
...
...
@@ -14,17 +15,19 @@ export default {
return
'
Open
'
;
},
},
template
:
`
<a
class="btn external-url has-tooltip"
data-container="body"
:href="externalUrl"
target="_blank"
rel="noopener noreferrer nofollow"
:title="title"
:aria-label="title">
<i class="fa fa-external-link" aria-hidden="true"></i>
</a>
`
,
};
</
script
>
<
template
>
<a
class=
"btn external-url has-tooltip"
data-container=
"body"
target=
"_blank"
rel=
"noopener noreferrer nofollow"
:title=
"title"
:aria-label=
"title"
:href=
"externalUrl"
>
<i
class=
"fa fa-external-link"
aria-hidden=
"true"
/>
</a>
</
template
>
app/assets/javascripts/environments/components/environment_item.js
浏览文件 @
f09f7539
import
Timeago
from
'
timeago.js
'
;
import
'
../../lib/utils/text_utility
'
;
import
ActionsComponent
from
'
./environment_actions
'
;
import
ExternalUrlComponent
from
'
./environment_external_url
'
;
import
StopComponent
from
'
./environment_stop
'
;
import
ExternalUrlComponent
from
'
./environment_external_url
.vue
'
;
import
StopComponent
from
'
./environment_stop
.vue
'
;
import
RollbackComponent
from
'
./environment_rollback
'
;
import
TerminalButtonComponent
from
'
./environment_terminal_button
'
;
import
TerminalButtonComponent
from
'
./environment_terminal_button
.vue
'
;
import
MonitoringButtonComponent
from
'
./environment_monitoring
'
;
import
CommitComponent
from
'
../../vue_shared/components/commit
'
;
import
eventHub
from
'
../event_hub
'
;
...
...
app/assets/javascripts/environments/components/environment_stop.
js
→
app/assets/javascripts/environments/components/environment_stop.
vue
浏览文件 @
f09f7539
<
script
>
/* global Flash */
/* eslint-disable no-new, no-alert */
/**
...
...
@@ -50,17 +51,23 @@ export default {
}
},
},
template
:
`
<button type="button"
class="btn stop-env-link has-tooltip"
data-container="body"
@click="onClick"
:disabled="isLoading"
:title="title"
:aria-label="title">
<i class="fa fa-stop stop-env-icon" aria-hidden="true"></i>
<i v-if="isLoading" class="fa fa-spinner fa-spin" aria-hidden="true"></i>
</button>
`
,
};
</
script
>
<
template
>
<button
type=
"button"
class=
"btn stop-env-link has-tooltip"
data-container=
"body"
@
click=
"onClick"
:disabled=
"isLoading"
:title=
"title"
:aria-label=
"title"
>
<i
class=
"fa fa-stop stop-env-icon"
aria-hidden=
"true"
/>
<i
v-if=
"isLoading"
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
/>
</button>
</
template
>
app/assets/javascripts/environments/components/environment_terminal_button.
js
→
app/assets/javascripts/environments/components/environment_terminal_button.
vue
浏览文件 @
f09f7539
<
script
>
/**
* Renders a terminal button to open a web terminal.
* Used in environments table.
...
...
@@ -24,14 +25,15 @@ export default {
return
'
Terminal
'
;
},
},
template
:
`
<a class="btn terminal-button has-tooltip"
data-container="body"
:title="title"
:aria-label="title"
:href="terminalPath">
${
terminalIconSvg
}
</a>
`
,
};
</
script
>
<
template
>
<a
class=
"btn terminal-button has-tooltip"
data-container=
"body"
:title=
"title"
:aria-label=
"title"
:href=
"terminalPath"
v-html=
"terminalIconSvg"
>
</a>
</
template
>
spec/javascripts/environments/environment_external_url_spec.js
浏览文件 @
f09f7539
import
Vue
from
'
vue
'
;
import
externalUrlComp
from
'
~/environments/components/environment_external_url
'
;
import
externalUrlComp
from
'
~/environments/components/environment_external_url
.vue
'
;
describe
(
'
External URL Component
'
,
()
=>
{
let
ExternalUrlComponent
;
...
...
spec/javascripts/environments/environment_stop_spec.js
浏览文件 @
f09f7539
import
Vue
from
'
vue
'
;
import
stopComp
from
'
~/environments/components/environment_stop
'
;
import
stopComp
from
'
~/environments/components/environment_stop
.vue
'
;
describe
(
'
Stop Component
'
,
()
=>
{
let
StopComponent
;
...
...
spec/javascripts/environments/environment_terminal_button_spec.js
浏览文件 @
f09f7539
import
Vue
from
'
vue
'
;
import
terminalComp
from
'
~/environments/components/environment_terminal_button
'
;
import
terminalComp
from
'
~/environments/components/environment_terminal_button
.vue
'
;
describe
(
'
Stop Component
'
,
()
=>
{
let
TerminalComponent
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录