diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 23:08:30 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 23:08:30 +0300 |
| commit | 24b64edf09f62645ddfaf96e825cc3ed3a76cf1c (patch) | |
| tree | db8ef3d146854bd42f2bd4d97d28387b95776bc7 /app/assets/javascripts | |
| parent | f6e9078fb608144f8686dcd8a36876416815757c (diff) | |
| parent | a458211b6569b510593393220a6c1f5b4e25cfb8 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/subscription.js.coffee | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index ebf425550e9..7526398dadc 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -226,6 +226,10 @@ $ -> form = btn.closest("form") new ConfirmDangerModal(form, text) + + $(document).on 'click', 'button', -> + $(this).blur() + $('input[type="search"]').each -> $this = $(this) $this.attr 'value', $this.val() diff --git a/app/assets/javascripts/subscription.js.coffee b/app/assets/javascripts/subscription.js.coffee index 1a430f3aa47..08d494aba9f 100644 --- a/app/assets/javascripts/subscription.js.coffee +++ b/app/assets/javascripts/subscription.js.coffee @@ -19,3 +19,8 @@ class @Subscription action = if status == 'subscribed' then 'Unsubscribe' else 'Subscribe' btn.find('span').text(action) @subscription_status.find('>div').toggleClass('hidden') + + if btn.attr('data-original-title') + btn.tooltip('hide') + .attr('data-original-title', action) + .tooltip('fixTitle') |