Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
40c86c91
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,发现更多精彩内容 >>
提交
40c86c91
编写于
5月 28, 2016
作者:
F
Fatih Acet
提交者:
Z.J. van de Weg
6月 06, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor awardsHandler methods to work with votesBlock.
上级
f261be09
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
35 deletion
+36
-35
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+34
-34
app/assets/javascripts/notes.js.coffee
app/assets/javascripts/notes.js.coffee
+2
-1
未找到文件。
app/assets/javascripts/awards_handler.coffee
浏览文件 @
40c86c91
...
...
@@ -32,7 +32,7 @@ class @AwardsHandler
emoji
=
$target
.
find
(
'.icon'
).
data
'emoji'
$target
.
closest
(
'.js-awards-block'
).
addClass
'current'
@
addAward
@
getAwardUrl
(),
emoji
@
addAward
@
get
VotesBlock
(),
@
get
AwardUrl
(),
emoji
showEmojiMenu
:
(
$addBtn
)
->
...
...
@@ -100,23 +100,23 @@ class @AwardsHandler
$menu
.
css
(
css
)
addAward
:
(
awardUrl
,
emoji
,
checkMutuality
=
yes
)
->
addAward
:
(
votesBlock
,
awardUrl
,
emoji
,
checkMutuality
=
yes
)
->
emoji
=
@
normilizeEmojiName
emoji
@
postEmoji
awardUrl
,
emoji
,
=>
@
addAwardToEmojiBar
emoji
,
checkMutuality
@
addAwardToEmojiBar
votesBlock
,
emoji
,
checkMutuality
$
(
'.emoji-menu'
).
removeClass
'is-visible'
addAwardToEmojiBar
:
(
emoji
,
checkForMutuality
=
yes
)
->
addAwardToEmojiBar
:
(
votesBlock
,
emoji
,
checkForMutuality
=
yes
)
->
@
checkMutuality
emoji
if
checkForMutuality
@
addEmojiToFrequentlyUsedList
(
emoji
)
@
checkMutuality
votesBlock
,
emoji
if
checkForMutuality
@
addEmojiToFrequentlyUsedList
emoji
emoji
=
@
normilizeEmojiName
(
emoji
)
$emojiBtn
=
@
findEmojiIcon
(
emoji
).
parent
()
emoji
=
@
normilizeEmojiName
emoji
$emojiBtn
=
@
findEmojiIcon
(
votesBlock
,
emoji
).
parent
()
if
$emojiBtn
.
length
>
0
if
@
isActive
$emojiBtn
...
...
@@ -125,10 +125,10 @@ class @AwardsHandler
counter
=
$emojiBtn
.
find
'.js-counter'
counter
.
text
parseInt
(
counter
.
text
())
+
1
$emojiBtn
.
addClass
'active'
@
addMeToUserList
emoji
@
addMeToUserList
votesBlock
,
emoji
else
@
getVotesBlock
()
.
removeClass
'hidden'
@
createEmoji
emoji
votesBlock
.
removeClass
'hidden'
@
createEmoji
votesBlock
,
emoji
getVotesBlock
:
->
return
$
'.js-awards-block.current'
...
...
@@ -137,7 +137,7 @@ class @AwardsHandler
getAwardUrl
:
->
return
@
getVotesBlock
().
data
'award-url'
checkMutuality
:
(
emoji
)
->
checkMutuality
:
(
votesBlock
,
emoji
)
->
awardUrl
=
@
getAwardUrl
()
...
...
@@ -145,8 +145,8 @@ class @AwardsHandler
mutualVote
=
if
emoji
is
'thumbsup'
then
'thumbsdown'
else
'thumbsup'
selector
=
"[data-emoji=
#{
mutualVote
}
]"
isAlreadyVoted
=
@
getVotesBlock
()
.
find
(
selector
).
parent
().
hasClass
'active'
@
addAward
awardUrl
,
mutualVote
,
no
if
isAlreadyVoted
isAlreadyVoted
=
votesBlock
.
find
(
selector
).
parent
().
hasClass
'active'
@
addAward
votesBlock
,
awardUrl
,
mutualVote
,
no
if
isAlreadyVoted
isActive
:
(
$emojiBtn
)
->
$emojiBtn
.
hasClass
'active'
...
...
@@ -155,20 +155,20 @@ class @AwardsHandler
decrementCounter
:
(
$emojiBtn
,
emoji
)
->
counter
=
$
(
'.js-counter'
,
$emojiBtn
)
counterNumber
=
parseInt
(
counter
.
text
())
counterNumber
=
parseInt
counter
.
text
(),
10
if
counterNumber
>
1
counter
.
text
(
counterNumber
-
1
)
@
removeMeFromUserList
(
$emojiBtn
,
emoji
)
counter
.
text
counterNumber
-
1
@
removeMeFromUserList
$emojiBtn
,
emoji
else
if
emoji
is
'thumbsup'
or
emoji
is
'thumbsdown'
$emojiBtn
.
tooltip
(
'destroy'
)
counter
.
text
(
'0'
)
@
removeMeFromUserList
(
$emojiBtn
,
emoji
)
$emojiBtn
.
tooltip
'destroy'
counter
.
text
'0'
@
removeMeFromUserList
$emojiBtn
,
emoji
@
removeEmoji
$emojiBtn
if
$emojiBtn
.
parents
(
'.note'
).
length
else
@
removeEmoji
$emojiBtn
$emojiBtn
.
removeClass
(
'active'
)
$emojiBtn
.
removeClass
'active'
removeEmoji
:
(
$emojiBtn
)
->
...
...
@@ -207,9 +207,9 @@ class @AwardsHandler
@
resetTooltip
(
awardBlock
)
addMeToUserList
:
(
emoji
)
->
addMeToUserList
:
(
votesBlock
,
emoji
)
->
awardBlock
=
@
findEmojiIcon
(
emoji
).
parent
()
awardBlock
=
@
findEmojiIcon
(
votesBlock
,
emoji
).
parent
()
origTitle
=
@
getAwardTooltip
awardBlock
users
=
[]
...
...
@@ -231,29 +231,29 @@ class @AwardsHandler
),
200
createEmoji_
:
(
emoji
)
->
createEmoji_
:
(
votesBlock
,
emoji
)
->
emojiCssClass
=
@
resolveNameToCssClass
emoji
buttonHtml
=
"<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
buttonHtml
=
"<button class='btn award-control js-emoji-btn has-tooltip active' title='me' data-placement='bottom'>
<div class='icon emoji-icon
#{
emojiCssClass
}
' data-emoji='
#{
emoji
}
'></div>
<span class='award-control-text js-counter'>1</span>
</button>"
emoji_node
=
$
(
buttonHtml
)
.
insertBefore
'.js-awards-block.current
.js-award-holder:not(.js-award-action-btn)'
.
insertBefore
votesBlock
.
find
'
.js-award-holder:not(.js-award-action-btn)'
.
find
'.emoji-icon'
.
data
'emoji'
,
emoji
$
(
'.award-control'
).
tooltip
()
$
(
'.js-awards-block.current'
)
.
removeClass
'current'
votesBlock
.
removeClass
'current'
createEmoji
:
(
emoji
)
->
createEmoji
:
(
votesBlock
,
emoji
)
->
return
@
createEmoji_
emoji
if
$
(
'.emoji-menu'
).
length
if
$
(
'.emoji-menu'
).
length
return
@
createEmoji_
votesBlock
,
emoji
@
createEmojiMenu
@
getAwardMenuUrl
(),
=>
@
createEmoji
emoji
@
createEmojiMenu
@
getAwardMenuUrl
(),
=>
@
createEmoji
votesBlock
,
emoji
getAwardMenuUrl
:
->
return
gl
.
awardMenuUrl
or
'/emojis'
...
...
@@ -278,14 +278,14 @@ class @AwardsHandler
callback
.
call
()
if
data
.
ok
findEmojiIcon
:
(
emoji
)
->
findEmojiIcon
:
(
votesBlock
,
emoji
)
->
return
$
(
".js-awards-block.current > .js-emoji-btn [data-emoji='
#{
emoji
}
']"
)
return
votesBlock
.
find
".js-emoji-btn [data-emoji='
#{
emoji
}
']"
scrollToAwards
:
->
options
=
scrollTop
:
$
(
'.awards'
).
offset
().
top
-
8
0
options
=
scrollTop
:
$
(
'.awards'
).
offset
().
top
-
11
0
$
(
'body, html'
).
animate
options
,
200
...
...
app/assets/javascripts/notes.js.coffee
浏览文件 @
40c86c91
...
...
@@ -167,7 +167,8 @@ class @Notes
return
if
note
.
award
awardsHandler
.
addAwardToEmojiBar
(
note
.
name
)
votesBlock
=
$
(
'.js-awards-block'
).
eq
0
awardsHandler
.
addAwardToEmojiBar
votesBlock
,
note
.
name
awardsHandler
.
scrollToAwards
()
# render note if it not present in loaded list
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录