diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-22 15:46:52 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-25 14:47:24 -0500 |
| commit | aa973ef9efb581a85d3fd883a380a22e5df9e056 (patch) | |
| tree | f24f9fb289300a81b4a3c8ec329fcc7276b8813a | |
| parent | 41441445a07649ce451bfffc546aaca87934655e (diff) | |
| download | gitlab-ce-aa973ef9efb581a85d3fd883a380a22e5df9e056.tar.gz | |
First pass at creating toggle button
| -rw-r--r-- | app/assets/javascripts/subscription.js | 8 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/subscription.js b/app/assets/javascripts/subscription.js index 5f9a3e00c22..bc68d67615c 100644 --- a/app/assets/javascripts/subscription.js +++ b/app/assets/javascripts/subscription.js @@ -14,6 +14,7 @@ toggleSubscription(event) { const button = event.currentTarget; const buttonSpan = button.querySelector('span'); + const toggleButton = $('.toggle-button'); if (!buttonSpan || button.classList.contains('disabled')) { return; } @@ -33,6 +34,13 @@ ); } else { buttonSpan.innerHTML = isSubscribed ? 'Subscribe' : 'Unsubscribe'; + if (isSubscribed) { + toggleButton.addClass('unsubscribed') + toggleButton.removeClass('subscribed') + } else { + toggleButton.addClass('subscribed') + toggleButton.removeClass('unsubscribed') + } } }); } diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e49bd5ebb13..2576bb4e2a0 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -123,9 +123,9 @@ = icon('rss', 'aria-hidden': 'true') %span.issuable-header-text.hide-collapsed.pull-left Notifications - - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed' - %button.btn.btn-default.pull-right.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" } - %span= subscribed ? 'Unsubscribe' : 'Subscribe' + .toggle-button-container + %button.btn.toggle-button.pull-right.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" , class: (subscribed ? "subscribed" : "unsubscribed") } + %span= subscribed ? 'Unsubscribe' : 'Subscribe' - project_ref = cross_project_reference(@project, issuable) .block.project-reference |