Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8dc1fa0d
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 搜索 >>
提交
8dc1fa0d
编写于
6月 04, 2016
作者:
F
Fatih Acet
提交者:
Z.J. van de Weg
6月 06, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated MR notes.
上级
7d3f8f54
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
22 deletion
+21
-22
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+11
-13
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+2
-2
app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
+1
-1
app/assets/javascripts/notes.js.coffee
app/assets/javascripts/notes.js.coffee
+2
-2
config/routes.rb
config/routes.rb
+1
-0
spec/javascripts/awards_handler_spec.js.coffee
spec/javascripts/awards_handler_spec.js.coffee
+4
-4
未找到文件。
app/assets/javascripts/awards_handler.coffee
浏览文件 @
8dc1fa0d
...
...
@@ -2,7 +2,7 @@ class @AwardsHandler
constructor
:
->
@
aliases
=
emojiAliases
()
@
aliases
=
gl
.
emojiAliases
()
$
(
document
)
.
off
'click'
,
'.js-add-award'
...
...
@@ -172,7 +172,7 @@ class @AwardsHandler
decrementCounter
:
(
$emojiButton
,
emoji
)
->
counter
=
$
(
'.js-counter'
,
$emojiButton
)
counter
=
$
'.js-counter'
,
$emojiButton
counterNumber
=
parseInt
counter
.
text
(),
10
if
counterNumber
>
1
...
...
@@ -218,9 +218,7 @@ class @AwardsHandler
awardBlock
.
closest
'.js-emoji-btn'
.
removeData
'original-title'
.
removeData
'title'
.
attr
'data-original-title'
,
newAuthors
.
attr
'data-title'
,
newAuthors
@
resetTooltip
awardBlock
...
...
@@ -258,8 +256,8 @@ class @AwardsHandler
</button>"
$emojiButton
=
$
buttonHtml
emoji_node
=
$emojiButton
.
insertBefore
votesBlock
.
find
'.js-award-holder
:not(.js-award-action-btn)
'
$emojiButton
.
insertBefore
votesBlock
.
find
'.js-award-holder'
.
find
'.emoji-icon'
.
data
'emoji'
,
emoji
...
...
@@ -281,21 +279,21 @@ class @AwardsHandler
if
$
(
'.emoji-menu'
).
length
return
@
createEmoji_
votesBlock
,
emoji
@
createEmojiMenu
@
getAwardMenuUrl
(),
=>
@
createEmoji
votesBlock
,
emoji
@
createEmojiMenu
@
getAwardMenuUrl
(),
=>
@
createEmoji
_
votesBlock
,
emoji
getAwardMenuUrl
:
->
return
gl
.
awardMenuUrl
or
'/emojis'
getAwardMenuUrl
:
->
return
gl
.
awardMenuUrl
resolveNameToCssClass
:
(
emoji
)
->
emoji
_icon
=
$
(
".emoji-menu-content [data-emoji='
#{
emoji
}
']"
)
emoji
Icon
=
$
".emoji-menu-content [data-emoji='
#{
emoji
}
']"
if
emoji
_i
con
.
length
>
0
unicodeName
=
emoji
_icon
.
data
(
'unicode-name'
)
if
emoji
I
con
.
length
>
0
unicodeName
=
emoji
Icon
.
data
'unicode-name'
else
# Find by alias
unicodeName
=
$
(
".emoji-menu-content [data-aliases*=':
#{
emoji
}
:']"
).
data
(
'unicode-name'
)
unicodeName
=
$
(
".emoji-menu-content [data-aliases*=':
#{
emoji
}
:']"
).
data
'unicode-name'
return
"emoji-
#{
unicodeName
}
"
...
...
@@ -303,7 +301,7 @@ class @AwardsHandler
postEmoji
:
(
awardUrl
,
emoji
,
callback
)
->
$
.
post
awardUrl
,
{
name
:
emoji
},
(
data
)
->
callback
.
call
()
if
data
.
ok
callback
()
if
data
.
ok
findEmojiIcon
:
(
votesBlock
,
emoji
)
->
...
...
app/assets/javascripts/dispatcher.js.coffee
浏览文件 @
8dc1fa0d
...
...
@@ -23,7 +23,7 @@ class Dispatcher
new
Issue
()
shortcut_handler
=
new
ShortcutsIssuable
()
new
ZenMode
()
window
.
awardsHandler
=
new
AwardsHandler
()
gl
.
awardsHandler
=
new
AwardsHandler
()
when
'projects:milestones:show'
,
'groups:milestones:show'
,
'dashboard:milestones:show'
new
Milestone
()
when
'dashboard:todos:index'
...
...
@@ -54,7 +54,7 @@ class Dispatcher
new
Diff
()
shortcut_handler
=
new
ShortcutsIssuable
(
true
)
new
ZenMode
()
window
.
awardsHandler
=
new
AwardsHandler
()
gl
.
awardsHandler
=
new
AwardsHandler
()
when
"projects:merge_requests:diffs"
new
Diff
()
new
ZenMode
()
...
...
app/assets/javascripts/lib/emoji_aliases.js.coffee.erb
浏览文件 @
8dc1fa0d
window
.emojiAliases = ->
gl
.emojiAliases = ->
JSON.parse('
<%=
Gitlab
::
AwardEmoji
.
aliases
.
to_json
%>
')
app/assets/javascripts/notes.js.coffee
浏览文件 @
8dc1fa0d
...
...
@@ -168,8 +168,8 @@ class @Notes
if
note
.
award
votesBlock
=
$
(
'.js-awards-block'
).
eq
0
awardsHandler
.
addAwardToEmojiBar
votesBlock
,
note
.
name
awardsHandler
.
scrollToAwards
()
gl
.
awardsHandler
.
addAwardToEmojiBar
votesBlock
,
note
.
name
gl
.
awardsHandler
.
scrollToAwards
()
# render note if it not present in loaded list
# or skip if rendered
...
...
config/routes.rb
浏览文件 @
8dc1fa0d
...
...
@@ -757,6 +757,7 @@ Rails.application.routes.draw do
resources
:notes
,
only:
[
:index
,
:create
,
:destroy
,
:update
],
constraints:
{
id:
/\d+/
}
do
member
do
post
:toggle_award_emoji
delete
:delete_attachment
end
end
...
...
spec/javascripts/awards_handler_spec.js.coffee
浏览文件 @
8dc1fa0d
...
...
@@ -3,10 +3,10 @@
#= require jquery.cookie
#= require ./fixtures/emoji_menu
awardsHandler
=
null
window
.
gl
or=
{}
window
.
gl
.
awardMenuUrl
=
'/emojis'
window
.
emojiAliases
=
->
return
{
'+1'
:
'thumbsup'
,
'-1'
:
'thumbsdown'
}
awardsHandler
=
null
window
.
gl
or=
{}
gl
.
emojiAliases
=
->
return
{
'+1'
:
'thumbsup'
,
'-1'
:
'thumbsdown'
}
gl
.
awardMenuUrl
=
'/emojis'
lazyAssert
=
(
done
,
assertFn
)
->
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录