diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-17 15:17:23 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-17 15:17:23 +0100 |
| commit | 83446ce7becf3f8af49694529a44e85ada0131c9 (patch) | |
| tree | 960a33796e881c37e0cec60768b988cac8ae5b38 | |
| parent | fd15e814446987c46d7b94f2a85e457d34941643 (diff) | |
| download | gitlab-ce-83446ce7becf3f8af49694529a44e85ada0131c9.tar.gz | |
Fixed bug with clicking custom again not opening modal
| -rw-r--r-- | app/assets/javascripts/notifications_dropdown.js.coffee | 3 | ||||
| -rw-r--r-- | app/views/shared/notifications/_notification_dropdown.html.haml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/notifications_dropdown.js.coffee b/app/assets/javascripts/notifications_dropdown.js.coffee index 15daf027c0a..c13010f56ec 100644 --- a/app/assets/javascripts/notifications_dropdown.js.coffee +++ b/app/assets/javascripts/notifications_dropdown.js.coffee @@ -4,6 +4,9 @@ class @NotificationsDropdown .off 'click', '.update-notification' .on 'click', '.update-notification', (e) -> e.preventDefault() + + return if $(this).is('.is-active') and $(this).data('notification-level') is 'custom' + notificationLevel = $(@).data 'notification-level' label = $(@).data 'notification-title' form = $(this).parents('form:first') diff --git a/app/views/shared/notifications/_notification_dropdown.html.haml b/app/views/shared/notifications/_notification_dropdown.html.haml index 969bc29b1a6..5c19876e971 100644 --- a/app/views/shared/notifications/_notification_dropdown.html.haml +++ b/app/views/shared/notifications/_notification_dropdown.html.haml @@ -8,6 +8,6 @@ %li.divider %li - %a.update-notification{ href: "#", role: "button", data: { toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), notification_level: "custom", notification_title: "Custom" } } + %a.update-notification{ href: "#", role: "button", class: ("is-active" if notification_setting.level == "custom"), data: { toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), notification_level: "custom", notification_title: "Custom" } } %strong.dropdown-menu-inner-title Custom %span.dropdown-menu-inner-content= notification_description("custom") |