Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ea052092
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,发现更多精彩内容 >>
提交
ea052092
编写于
3月 02, 2017
作者:
S
Simon Knox
提交者:
Alfredo Sumaran
3月 02, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove extra whitespace on dashboard projects page
上级
f0dc00d4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
10 deletion
+33
-10
app/assets/javascripts/user_callout.js
app/assets/javascripts/user_callout.js
+3
-1
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+2
-1
spec/javascripts/user_callout_spec.js.es6
spec/javascripts/user_callout_spec.js.es6
+28
-8
未找到文件。
app/assets/javascripts/user_callout.js
浏览文件 @
ea052092
...
...
@@ -43,6 +43,8 @@ class UserCallout {
this
.
userCalloutBody
.
append
(
$template
);
$template
.
find
(
closeButton
).
on
(
'
click
'
,
e
=>
this
.
dismissCallout
(
e
));
$template
.
find
(
userCalloutBtn
).
on
(
'
click
'
,
e
=>
this
.
dismissCallout
(
e
));
}
else
{
this
.
userCalloutBody
.
remove
();
}
}
...
...
@@ -50,7 +52,7 @@ class UserCallout {
Cookies
.
set
(
USER_CALLOUT_COOKIE
,
'
true
'
);
const
$currentTarget
=
$
(
e
.
currentTarget
);
if
(
$currentTarget
.
hasClass
(
'
close-user-callout
'
))
{
this
.
userCalloutBody
.
empty
();
this
.
userCalloutBody
.
remove
();
}
}
}
...
...
app/assets/stylesheets/pages/profile.scss
浏览文件 @
ea052092
...
...
@@ -279,7 +279,7 @@ table.u2f-registrations {
}
.user-callout
{
margin
:
24px
auto
0
;
margin
:
0
auto
;
.bordered-box
{
border
:
1px
solid
$border-color
;
...
...
@@ -287,6 +287,7 @@ table.u2f-registrations {
}
.landing
{
margin-top
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
.close
{
...
...
spec/javascripts/user_callout_spec.js.es6
浏览文件 @
ea052092
...
...
@@ -3,35 +3,55 @@ const UserCallout = require('~/user_callout');
const USER_CALLOUT_COOKIE = 'user_callout_dismissed';
const Cookie = window.Cookies;
describe('UserCallout',
() =>
{
describe('UserCallout',
function ()
{
const fixtureName = 'static/user_callout.html.raw';
preloadFixtures(fixtureName);
beforeEach(
function ()
{
beforeEach(
() =>
{
loadFixtures(fixtureName);
Cookie.remove(USER_CALLOUT_COOKIE);
this.userCallout = new UserCallout();
this.closeButton = $('.close-user-callout');
this.userCalloutBtn = $('.user-callout-btn');
this.userCalloutContainer = $('.user-callout');
Cookie.set(USER_CALLOUT_COOKIE, 'false');
});
afterEach(function () {
Cookie.set(USER_CALLOUT_COOKIE, 'false');
it('does not show when cookie is set not defined', () => {
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBeUndefined();
expect(this.userCalloutContainer.is(':visible')).toBe(true);
});
it('shows when cookie is set to false', function () {
it('shows when cookie is set to false', () => {
Cookie.set(USER_CALLOUT_COOKIE, 'false');
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBeDefined();
expect(this.userCalloutContainer.is(':visible')).toBe(true);
});
it('hides when user clicks on the dismiss-icon',
function ()
{
it('hides when user clicks on the dismiss-icon',
() =>
{
this.closeButton.click();
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBe('true');
});
it('hides when user clicks on the "check it out" button',
function ()
{
it('hides when user clicks on the "check it out" button',
() =>
{
this.userCalloutBtn.click();
expect(Cookie.get(USER_CALLOUT_COOKIE)).toBe('true');
});
});
describe('UserCallout when cookie is present', function () {
const fixtureName = 'static/user_callout.html.raw';
preloadFixtures(fixtureName);
beforeEach(() => {
loadFixtures(fixtureName);
Cookie.set(USER_CALLOUT_COOKIE, 'true');
this.userCallout = new UserCallout();
this.userCalloutContainer = $('.user-callout');
});
it('removes the DOM element', () => {
expect(this.userCalloutContainer.length).toBe(0);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录