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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
e3292f1e
Commit
e3292f1e
authored
Aug 09, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix awardable button mutuality loading spinners
parent
b8130d42
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
13 deletions
+2
-13
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+1
-13
No files found.
CHANGELOG
View file @
e3292f1e
...
@@ -16,6 +16,7 @@ v 8.11.0 (unreleased)
...
@@ -16,6 +16,7 @@ v 8.11.0 (unreleased)
- Expand commit message width in repo view (ClemMakesApps)
- Expand commit message width in repo view (ClemMakesApps)
- Cache highlighted diff lines for merge requests
- Cache highlighted diff lines for merge requests
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
- Fix awardable button mutuality loading spinners (ClemMakesApps)
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
- Optimize maximum user access level lookup in loading of notes
- Optimize maximum user access level lookup in loading of notes
- Add "No one can push" as an option for protected branches. !5081
- Add "No one can push" as an option for protected branches. !5081
...
...
app/assets/javascripts/awards_handler.js
View file @
e3292f1e
...
@@ -161,23 +161,11 @@
...
@@ -161,23 +161,11 @@
$emojiButton
=
votesBlock
.
find
(
"
[data-emoji=
"
+
mutualVote
+
"
]
"
).
parent
();
$emojiButton
=
votesBlock
.
find
(
"
[data-emoji=
"
+
mutualVote
+
"
]
"
).
parent
();
isAlreadyVoted
=
$emojiButton
.
hasClass
(
'
active
'
);
isAlreadyVoted
=
$emojiButton
.
hasClass
(
'
active
'
);
if
(
isAlreadyVoted
)
{
if
(
isAlreadyVoted
)
{
this
.
showEmojiLoader
(
$emojiButton
);
this
.
addAward
(
votesBlock
,
awardUrl
,
mutualVote
,
false
);
return
this
.
addAward
(
votesBlock
,
awardUrl
,
mutualVote
,
false
,
function
()
{
return
$emojiButton
.
removeClass
(
'
is-loading
'
);
});
}
}
}
}
};
};
AwardsHandler
.
prototype
.
showEmojiLoader
=
function
(
$emojiButton
)
{
var
$loader
;
$loader
=
$emojiButton
.
find
(
'
.fa-spinner
'
);
if
(
!
$loader
.
length
)
{
$emojiButton
.
append
(
'
<i class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading"></i>
'
);
}
return
$emojiButton
.
addClass
(
'
is-loading
'
);
};
AwardsHandler
.
prototype
.
isActive
=
function
(
$emojiButton
)
{
AwardsHandler
.
prototype
.
isActive
=
function
(
$emojiButton
)
{
return
$emojiButton
.
hasClass
(
'
active
'
);
return
$emojiButton
.
hasClass
(
'
active
'
);
};
};
...
...
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