Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
16e291b9
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,发现更多精彩内容 >>
提交
16e291b9
编写于
4月 19, 2017
作者:
L
Luke "Jared" Bennett
提交者:
Alfredo Sumaran
4月 19, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Resolve "start discussion toggle clicking divider causes UI break"
上级
28c63ce3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
47 addition
and
6 deletion
+47
-6
app/assets/javascripts/droplab/constants.js
app/assets/javascripts/droplab/constants.js
+2
-0
app/assets/javascripts/droplab/drop_down.js
app/assets/javascripts/droplab/drop_down.js
+2
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+4
-0
app/views/projects/notes/_comment_button.html.haml
app/views/projects/notes/_comment_button.html.haml
+1
-1
spec/javascripts/droplab/constants_spec.js
spec/javascripts/droplab/constants_spec.js
+6
-0
spec/javascripts/droplab/drop_down_spec.js
spec/javascripts/droplab/drop_down_spec.js
+25
-3
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+7
-1
未找到文件。
app/assets/javascripts/droplab/constants.js
浏览文件 @
16e291b9
...
...
@@ -2,10 +2,12 @@ const DATA_TRIGGER = 'data-dropdown-trigger';
const
DATA_DROPDOWN
=
'
data-dropdown
'
;
const
SELECTED_CLASS
=
'
droplab-item-selected
'
;
const
ACTIVE_CLASS
=
'
droplab-item-active
'
;
const
IGNORE_CLASS
=
'
droplab-item-ignore
'
;
export
{
DATA_TRIGGER
,
DATA_DROPDOWN
,
SELECTED_CLASS
,
ACTIVE_CLASS
,
IGNORE_CLASS
,
};
app/assets/javascripts/droplab/drop_down.js
浏览文件 @
16e291b9
/* eslint-disable */
import
utils
from
'
./utils
'
;
import
{
SELECTED_CLASS
}
from
'
./constants
'
;
import
{
SELECTED_CLASS
,
IGNORE_CLASS
}
from
'
./constants
'
;
var
DropDown
=
function
(
list
)
{
this
.
currentIndex
=
0
;
...
...
@@ -36,6 +36,7 @@ Object.assign(DropDown.prototype, {
clickEvent
:
function
(
e
)
{
if
(
e
.
target
.
tagName
===
'
UL
'
)
return
;
if
(
e
.
target
.
classList
.
contains
(
IGNORE_CLASS
))
return
;
var
selected
=
utils
.
closest
(
e
.
target
,
'
LI
'
);
if
(
!
selected
)
return
;
...
...
app/assets/stylesheets/framework/dropdowns.scss
浏览文件 @
16e291b9
...
...
@@ -564,3 +564,7 @@
color
:
$gl-text-color-secondary
;
}
}
.droplab-item-ignore
{
pointer-events
:
none
;
}
app/views/projects/notes/_comment_button.html.haml
浏览文件 @
16e291b9
...
...
@@ -16,7 +16,7 @@
%p
Add a general comment to this
#{
noteable_name
}
.
%li
.divider
%li
.divider
.droplab-item-ignore
%li
#discussion
{
data:
{
value:
'DiscussionNote'
,
'submit-text'
=>
'Start discussion'
,
'close-text'
=>
"Start discussion & close #{noteable_name}"
,
'reopen-text'
=>
"Start discussion & reopen #{noteable_name}"
}
}
%a
{
href:
'#'
}
...
...
spec/javascripts/droplab/constants_spec.js
浏览文件 @
16e291b9
...
...
@@ -26,4 +26,10 @@ describe('constants', function () {
expect
(
constants
.
ACTIVE_CLASS
).
toBe
(
'
droplab-item-active
'
);
});
});
describe
(
'
IGNORE_CLASS
'
,
function
()
{
it
(
'
should be `droplab-item-ignore`
'
,
function
()
{
expect
(
constants
.
IGNORE_CLASS
).
toBe
(
'
droplab-item-ignore
'
);
});
});
});
spec/javascripts/droplab/drop_down_spec.js
浏览文件 @
16e291b9
...
...
@@ -2,7 +2,7 @@
import
DropDown
from
'
~/droplab/drop_down
'
;
import
utils
from
'
~/droplab/utils
'
;
import
{
SELECTED_CLASS
}
from
'
~/droplab/constants
'
;
import
{
SELECTED_CLASS
,
IGNORE_CLASS
}
from
'
~/droplab/constants
'
;
describe
(
'
DropDown
'
,
function
()
{
describe
(
'
class constructor
'
,
function
()
{
...
...
@@ -128,9 +128,10 @@ describe('DropDown', function () {
describe
(
'
clickEvent
'
,
function
()
{
beforeEach
(
function
()
{
this
.
classList
=
jasmine
.
createSpyObj
(
'
classList
'
,
[
'
contains
'
]);
this
.
list
=
{
dispatchEvent
:
()
=>
{}
};
this
.
dropdown
=
{
hide
:
()
=>
{},
list
:
this
.
list
,
addSelectedClass
:
()
=>
{}
};
this
.
event
=
{
preventDefault
:
()
=>
{},
target
:
{}
};
this
.
event
=
{
preventDefault
:
()
=>
{},
target
:
{
classList
:
this
.
classList
}
};
this
.
customEvent
=
{};
this
.
closestElement
=
{};
...
...
@@ -140,6 +141,7 @@ describe('DropDown', function () {
spyOn
(
this
.
event
,
'
preventDefault
'
);
spyOn
(
window
,
'
CustomEvent
'
).
and
.
returnValue
(
this
.
customEvent
);
spyOn
(
utils
,
'
closest
'
).
and
.
returnValues
(
this
.
closestElement
,
undefined
);
this
.
classList
.
contains
.
and
.
returnValue
(
false
);
DropDown
.
prototype
.
clickEvent
.
call
(
this
.
dropdown
,
this
.
event
);
});
...
...
@@ -164,15 +166,35 @@ describe('DropDown', function () {
expect
(
window
.
CustomEvent
).
toHaveBeenCalledWith
(
'
click.dl
'
,
jasmine
.
any
(
Object
));
});
it
(
'
should call .classList.contains checking for IGNORE_CLASS
'
,
function
()
{
expect
(
this
.
classList
.
contains
).
toHaveBeenCalledWith
(
IGNORE_CLASS
);
});
it
(
'
should call .dispatchEvent with the customEvent
'
,
function
()
{
expect
(
this
.
list
.
dispatchEvent
).
toHaveBeenCalledWith
(
this
.
customEvent
);
});
describe
(
'
if the target is a UL element
'
,
function
()
{
beforeEach
(
function
()
{
this
.
event
=
{
preventDefault
:
()
=>
{},
target
:
{
tagName
:
'
UL
'
}
};
this
.
event
=
{
preventDefault
:
()
=>
{},
target
:
{
tagName
:
'
UL
'
,
classList
:
this
.
classList
}
};
spyOn
(
this
.
event
,
'
preventDefault
'
);
utils
.
closest
.
calls
.
reset
();
DropDown
.
prototype
.
clickEvent
.
call
(
this
.
dropdown
,
this
.
event
);
});
it
(
'
should return immediately
'
,
function
()
{
expect
(
utils
.
closest
).
not
.
toHaveBeenCalled
();
});
});
describe
(
'
if the target has the IGNORE_CLASS class
'
,
function
()
{
beforeEach
(
function
()
{
this
.
event
=
{
preventDefault
:
()
=>
{},
target
:
{
tagName
:
'
LI
'
,
classList
:
this
.
classList
}
};
spyOn
(
this
.
event
,
'
preventDefault
'
);
this
.
classList
.
contains
.
and
.
returnValue
(
true
);
utils
.
closest
.
calls
.
reset
();
DropDown
.
prototype
.
clickEvent
.
call
(
this
.
dropdown
,
this
.
event
);
...
...
spec/support/features/discussion_comments_shared_example.rb
浏览文件 @
16e291b9
...
...
@@ -73,9 +73,15 @@ shared_examples 'discussion comments' do |resource_name|
expect
(
page
).
not_to
have_selector
menu_selector
end
it
'clicking the ul padding should not change the text'
do
it
'clicking the ul padding
or divider
should not change the text'
do
find
(
menu_selector
).
trigger
'click'
expect
(
page
).
to
have_selector
menu_selector
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
find
(
"
#{
menu_selector
}
.divider"
).
trigger
'click'
expect
(
page
).
to
have_selector
menu_selector
expect
(
find
(
dropdown_selector
)).
to
have_content
'Comment'
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录