From e45064e8dc89c87a6155f89ae21051bf8e8b660b Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Mon, 15 Aug 2016 15:01:26 -0500
Subject: [PATCH] Fix diff comments inverted toggle bug
---
CHANGELOG | 1 +
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');
--
GitLab