diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-13 10:00:26 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-21 08:35:11 +0100 |
| commit | a4d4a7e6357b60aceec93f6539b5dbefd3327032 (patch) | |
| tree | 910c02d3c2a31e885e682416a2ef1cd34372f5ee | |
| parent | a8957458f76cf3049b75a24c4f91241fe5a50e29 (diff) | |
| download | gitlab-ce-a4d4a7e6357b60aceec93f6539b5dbefd3327032.tar.gz | |
Fixed issue with notification dropdownn not updating active
Changes bell icon to spinner to show the action is happening
Removed the flash message
Closes #18480
| -rw-r--r-- | app/assets/javascripts/notifications_dropdown.js.coffee | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/project.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/javascripts/notifications_dropdown.js.coffee b/app/assets/javascripts/notifications_dropdown.js.coffee index 74d2298c1fa..0bbd082c156 100644 --- a/app/assets/javascripts/notifications_dropdown.js.coffee +++ b/app/assets/javascripts/notifications_dropdown.js.coffee @@ -1,5 +1,5 @@ class @NotificationsDropdown - $ -> + constructor: -> $(document) .off 'click', '.update-notification' .on 'click', '.update-notification', (e) -> @@ -18,7 +18,8 @@ class @NotificationsDropdown .off 'ajax:success', '.notification-form' .on 'ajax:success', '.notification-form', (e, data) -> if data.saved - new Flash('Notification settings saved', 'notice') - $(e.currentTarget).closest('.notification-dropdown').replaceWith(data.html) + $(e.currentTarget) + .closest('.notification-dropdown') + .replaceWith(data.html) else new Flash('Failed to save new settings', 'alert') diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee index 54c539d5f9b..96e10dd7e8a 100644 --- a/app/assets/javascripts/project.js.coffee +++ b/app/assets/javascripts/project.js.coffee @@ -35,7 +35,6 @@ class @Project $(@).parents('.no-password-message').remove() e.preventDefault() - @projectSelectDropdown() projectSelectDropdown: -> diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 346badf6d86..d3e59d7fdb9 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -101,7 +101,8 @@ .notifications-btn { - .fa-bell { + .fa-bell, + .fa-spinner { margin-right: 6px; } |