diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 23:07:39 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 23:07:39 +0300 |
| commit | c9878373361676e8103576008dead63369d951e5 (patch) | |
| tree | d9e2f589ebd7c437eb598d716ec1dde24679712c /app/assets/javascripts | |
| parent | b5018ac53de2c7eba9eb35b1d8498ffe6c0a3515 (diff) | |
| parent | a458211b6569b510593393220a6c1f5b4e25cfb8 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes
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 c300370f40c..3416e4c1b4b 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') |