diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-12-18 21:07:06 +0100 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-12-18 21:07:06 +0100 |
| commit | e7d019c6997fbfed56a415de6dfe4754a5c966d4 (patch) | |
| tree | 988e5c53eeff9ab3fe3932f01f90d75336df1802 | |
| parent | 78e8ac5da1fce5dab13667b9eafe7c91550e7210 (diff) | |
| download | gitlab-ce-leave-project-btn.tar.gz | |
Bring back "notification-dropdown" class for styling and use "js-notification-dropdown" for JavaScriptleave-project-btn
| -rw-r--r-- | app/assets/javascripts/notifications_dropdown.js | 2 | ||||
| -rw-r--r-- | app/views/shared/notifications/_button.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notifications_dropdown.js b/app/assets/javascripts/notifications_dropdown.js index 324b68a7efc..5d0d594073d 100644 --- a/app/assets/javascripts/notifications_dropdown.js +++ b/app/assets/javascripts/notifications_dropdown.js @@ -19,7 +19,7 @@ }); $(document).off('ajax:success', '.notification-form').on('ajax:success', '.notification-form', function(e, data) { if (data.saved) { - return $(e.currentTarget).closest('.notification-dropdown').replaceWith(data.html); + return $(e.currentTarget).closest('.js-notification-dropdown').replaceWith(data.html); } else { return new Flash('Failed to save new settings', 'alert'); } diff --git a/app/views/shared/notifications/_button.html.haml b/app/views/shared/notifications/_button.html.haml index ce33d1497ba..1d072c16b32 100644 --- a/app/views/shared/notifications/_button.html.haml +++ b/app/views/shared/notifications/_button.html.haml @@ -1,5 +1,5 @@ - if notification_setting - .project-action-button.dropdown.inline + .js-notification-dropdown.notification-dropdown.project-action-button.dropdown.inline = form_for notification_setting, remote: true, html: { class: "inline notification-form" } do |f| = hidden_setting_source_input(notification_setting) = f.hidden_field :level, class: "notification_setting_level" |