diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-16 02:04:09 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-16 02:04:09 +0300 |
| commit | fe125f8dc9925a61d20913ffdd15d2ae03cbde75 (patch) | |
| tree | 5a0671ad5f2a5c06c7ed6d6e74d8d6ff521d7f3a /app/assets/javascripts/lib | |
| parent | 6f8626de0609da6c789457153b2b19dc79db2c95 (diff) | |
| parent | 5d16d50cebb115773c1a16a141adab150eec8764 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
# Conflicts:
# app/assets/javascripts/lib/common_utils.js.coffee
Diffstat (limited to 'app/assets/javascripts/lib')
| -rw-r--r-- | app/assets/javascripts/lib/common_utils.js.coffee | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/common_utils.js.coffee b/app/assets/javascripts/lib/common_utils.js.coffee index cf7c27cb265..e39dcb2daa9 100644 --- a/app/assets/javascripts/lib/common_utils.js.coffee +++ b/app/assets/javascripts/lib/common_utils.js.coffee @@ -23,6 +23,24 @@ return if @isInGroupsPage() then $('body').data 'group' else null + + gl.utils.updateTooltipTitle = ($tooltipEl, newTitle) -> + + $tooltipEl + .tooltip 'destroy' + .attr 'title', newTitle + .tooltip 'fixTitle' + + + gl.utils.preventDisabledButtons = -> + + $('.btn').click (e) -> + if $(this).hasClass 'disabled' + e.preventDefault() + e.stopImmediatePropagation() + return false + + jQuery.timefor = (time, suffix, expiredLabel) -> return '' unless time @@ -44,5 +62,4 @@ return timefor - ) window |