diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-15 15:01:26 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-17 09:43:45 -0500 |
| commit | e45064e8dc89c87a6155f89ae21051bf8e8b660b (patch) | |
| tree | 17f84c5dbb03607202b88dc52b54f43259b7b93a | |
| parent | 06e3bb9f232329674bdc162dc8f973a19b03f3c4 (diff) | |
| download | gitlab-ce-e45064e8dc89c87a6155f89ae21051bf8e8b660b.tar.gz | |
Fix diff comments inverted toggle bug
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index ccc60846787..1aabc512b43 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -85,6 +85,7 @@ v 8.11.0 (unreleased) - Allow branch names ending with .json for graph and network page !5579 (winniehell) - Add the `sprockets-es6` gem - Improve OAuth2 client documentation (muteor) + - Fix diff comments inverted toggle bug (ClemMakesApps) - Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska) - Profile requests when a header is passed - Avoid calculation of line_code and position for _line partial when showing diff notes on discussion tab. diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f1aab067351..5045c9d0286 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -223,8 +223,11 @@ return $('.navbar-toggle').toggleClass('active'); }); $body.on("click", ".js-toggle-diff-comments", function(e) { - $(this).toggleClass('active'); - $(this).closest(".diff-file").find(".notes_holder").toggle(); + var $this = $(this); + var showComments = $this.hasClass('active'); + + $this.toggleClass('active'); + $this.closest(".diff-file").find(".notes_holder").toggle(showComments); return e.preventDefault(); }); $document.off("click", '.js-confirm-danger'); |