Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
180c45b3
Commit
180c45b3
authored
Apr 22, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AwardsHandler follows code style conventions
parent
6ff740ff
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
42 deletions
+50
-42
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+37
-29
app/assets/javascripts/notes.js.coffee
app/assets/javascripts/notes.js.coffee
+4
-4
app/views/votes/_votes_block.html.haml
app/views/votes/_votes_block.html.haml
+9
-9
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
180c45b3
class
@
AwardsHandler
constructor
:
(
@
get
_emojis_url
,
@
post_emoji_url
,
@
noteable_type
,
@
noteable_i
d
,
@
unicodes
)
->
constructor
:
(
@
get
EmojisUrl
,
@
postEmojiUrl
,
@
noteableType
,
@
noteableI
d
,
@
unicodes
)
->
$
(
".js-add-award"
).
on
"click"
,
(
event
)
=>
event
.
stopPropagation
()
event
.
preventDefault
()
...
...
@@ -23,13 +23,13 @@ class @AwardsHandler
.
find
(
".icon"
)
.
data
"emoji"
if
emoji
is
"thumbsup"
and
awards
_h
andler
.
didUserClickEmoji
$
(
this
),
"thumbsdown"
awards
_h
andler
.
addAward
"thumbsdown"
if
emoji
is
"thumbsup"
and
awards
H
andler
.
didUserClickEmoji
$
(
this
),
"thumbsdown"
awards
H
andler
.
addAward
"thumbsdown"
else
if
emoji
is
"thumbsdown"
and
awards
_h
andler
.
didUserClickEmoji
$
(
this
),
"thumbsup"
awards
_h
andler
.
addAward
"thumbsup"
else
if
emoji
is
"thumbsdown"
and
awards
H
andler
.
didUserClickEmoji
$
(
this
),
"thumbsup"
awards
H
andler
.
addAward
"thumbsup"
awards
_h
andler
.
addAward
emoji
awards
H
andler
.
addAward
emoji
$
(
this
).
trigger
'blur'
...
...
@@ -47,7 +47,7 @@ class @AwardsHandler
$
(
"#emoji_search"
).
focus
()
else
$
(
'.js-add-award'
).
addClass
"is-loading"
$
.
get
@
get
_emojis_u
rl
,
(
response
)
=>
$
.
get
@
get
EmojisU
rl
,
(
response
)
=>
$
(
'.js-add-award'
).
removeClass
"is-loading"
$
(
".js-award-holder"
).
append
response
setTimeout
=>
...
...
@@ -99,25 +99,25 @@ class @AwardsHandler
emojiIcon
.
remove
()
removeMeFromAuthorList
:
(
emoji
)
->
award
_b
lock
=
@
findEmojiIcon
(
emoji
).
parent
()
authors
=
award
_b
lock
award
B
lock
=
@
findEmojiIcon
(
emoji
).
parent
()
authors
=
award
B
lock
.
attr
(
"data-original-title"
)
.
split
(
", "
)
authors
.
splice
(
authors
.
indexOf
(
"me"
),
1
)
award
_b
lock
award
B
lock
.
closest
(
".js-emoji-btn"
)
.
attr
(
"data-original-title"
,
authors
.
join
(
", "
))
@
resetTooltip
(
award
_b
lock
)
@
resetTooltip
(
award
B
lock
)
addMeToAuthorList
:
(
emoji
)
->
award
_b
lock
=
@
findEmojiIcon
(
emoji
).
parent
()
origTitle
=
award
_b
lock
.
attr
(
"data-original-title"
).
trim
()
award
B
lock
=
@
findEmojiIcon
(
emoji
).
parent
()
origTitle
=
award
B
lock
.
attr
(
"data-original-title"
).
trim
()
authors
=
[]
if
origTitle
authors
=
origTitle
.
split
(
', '
)
authors
.
push
(
"me"
)
award
_b
lock
.
attr
(
"data-original-title"
,
authors
.
join
(
", "
))
@
resetTooltip
(
award
_b
lock
)
award
B
lock
.
attr
(
"data-original-title"
,
authors
.
join
(
", "
))
@
resetTooltip
(
award
B
lock
)
resetTooltip
:
(
award
)
->
award
.
tooltip
(
"destroy"
)
...
...
@@ -139,20 +139,28 @@ class @AwardsHandler
"</button>"
)
emoji_node
=
$
(
nodes
.
join
(
"
\n
"
))
$
(
nodes
.
join
(
"
\n
"
))
.
insertBefore
(
".js-award-holder"
)
.
find
(
".emoji-icon"
)
.
data
(
"emoji"
,
emoji
)
$
(
'.award-control'
).
tooltip
()
resolveNameToCssClass
:
(
emoji
)
->
"emoji-
#{
@
unicodes
[
emoji
]
}
"
emoji_icon
=
$
(
".emoji-menu-content [data-emoji='
#{
emoji
}
']"
)
if
emoji_icon
.
length
>
0
unicodeName
=
emoji_icon
.
data
(
'unicode-name'
)
else
# Find by alias
unicodeName
=
$
(
".emoji-menu-content [data-aliases*=':
#{
emoji
}
:']"
).
data
(
'unicode-name'
)
"emoji-
#{
unicodeName
}
"
postEmoji
:
(
emoji
,
callback
)
->
$
.
post
@
post
_emoji_u
rl
,
{
note
:
{
$
.
post
@
post
EmojiU
rl
,
{
note
:
{
note
:
":
#{
emoji
}
:"
noteable_type
:
@
noteable
_t
ype
noteable_id
:
@
noteable
_i
d
noteable_type
:
@
noteable
T
ype
noteable_id
:
@
noteable
I
d
}},(
data
)
->
if
data
.
ok
callback
.
call
()
...
...
@@ -166,21 +174,21 @@ class @AwardsHandler
},
200
)
addEmojiToFrequentlyUsedList
:
(
emoji
)
->
frequently
_used_e
mojis
=
@
getFrequentlyUsedEmojis
()
frequently
_used_e
mojis
.
push
(
emoji
)
$
.
cookie
(
'frequently_used_emojis'
,
frequently
_used_e
mojis
.
join
(
","
),
{
expires
:
365
})
frequently
UsedE
mojis
=
@
getFrequentlyUsedEmojis
()
frequently
UsedE
mojis
.
push
(
emoji
)
$
.
cookie
(
'frequently_used_emojis'
,
frequently
UsedE
mojis
.
join
(
","
),
{
expires
:
365
})
getFrequentlyUsedEmojis
:
->
frequently
_used_e
mojis
=
(
$
.
cookie
(
'frequently_used_emojis'
)
||
""
).
split
(
","
)
_
.
compact
(
_
.
uniq
(
frequently
_used_e
mojis
))
frequently
UsedE
mojis
=
(
$
.
cookie
(
'frequently_used_emojis'
)
||
""
).
split
(
","
)
_
.
compact
(
_
.
uniq
(
frequently
UsedE
mojis
))
renderFrequentlyUsedBlock
:
->
if
$
.
cookie
(
'frequently_used_emojis'
)
frequently
_used_e
mojis
=
@
getFrequentlyUsedEmojis
()
frequently
UsedE
mojis
=
@
getFrequentlyUsedEmojis
()
ul
=
$
(
"<ul>"
)
for
emoji
in
frequently
_used_e
mojis
for
emoji
in
frequently
UsedE
mojis
do
(
emoji
)
->
$
(
".emoji-menu-content [data-emoji='
#{
emoji
}
']"
).
closest
(
"li"
).
clone
().
appendTo
(
ul
)
...
...
@@ -196,8 +204,8 @@ class @AwardsHandler
if
term
# Generate a search result block
h5
=
$
(
"<h5>"
).
text
(
"Search results"
).
addClass
(
"emoji-search"
)
found
_e
mojis
=
@
searchEmojis
(
term
).
show
()
ul
=
$
(
"<ul>"
).
addClass
(
"emoji-menu-list emoji-menu-search"
).
append
(
found
_e
mojis
)
found
E
mojis
=
@
searchEmojis
(
term
).
show
()
ul
=
$
(
"<ul>"
).
addClass
(
"emoji-menu-list emoji-menu-search"
).
append
(
found
E
mojis
)
$
(
".emoji-menu-content ul, .emoji-menu-content h5"
).
hide
()
$
(
".emoji-menu-content"
).
append
(
h5
).
append
(
ul
)
else
...
...
app/assets/javascripts/notes.js.coffee
View file @
180c45b3
...
...
@@ -167,8 +167,8 @@ class @Notes
return
if
note
.
award
awards
_h
andler
.
addAwardToEmojiBar
(
note
.
note
)
awards
_h
andler
.
scrollToAwards
()
awards
H
andler
.
addAwardToEmojiBar
(
note
.
note
)
awards
H
andler
.
scrollToAwards
()
# render note if it not present in loaded list
# or skip if rendered
...
...
app/views/votes/_votes_block.html.haml
View file @
180c45b3
...
...
@@ -15,16 +15,16 @@
-
if
current_user
:javascript
var
get
_emojis_u
rl
=
"
#{
emojis_path
}
"
;
var
post
_emoji_u
rl
=
"
#{
award_toggle_namespace_project_notes_path
(
@project
.
namespace
,
@project
)
}
"
;
var
noteable
_t
ype
=
"
#{
votable
.
class
.
name
.
underscore
}
"
;
var
noteable
_i
d
=
"
#{
votable
.
id
}
"
;
var
get
EmojisU
rl
=
"
#{
emojis_path
}
"
;
var
post
EmojiU
rl
=
"
#{
award_toggle_namespace_project_notes_path
(
@project
.
namespace
,
@project
)
}
"
;
var
noteable
T
ype
=
"
#{
votable
.
class
.
name
.
underscore
}
"
;
var
noteable
I
d
=
"
#{
votable
.
id
}
"
;
var
unicodes
=
#{
AwardEmoji
.
unicode
.
to_json
}
;
window
.
awards
_h
andler
=
new
AwardsHandler
(
get
_emojis_u
rl
,
post
_emoji_u
rl
,
noteable
_t
ype
,
noteable
_i
d
,
window
.
awards
H
andler
=
new
AwardsHandler
(
get
EmojisU
rl
,
post
EmojiU
rl
,
noteable
T
ype
,
noteable
I
d
,
unicodes
);
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment