summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-17 18:08:37 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-05-17 18:13:27 -0400
commitbd85e8ea5a54757e4a6f6b6ed6687b1e21e411e9 (patch)
tree8a95c0516fb47dba557e8a9ab4553baee2d4dab7
parentc74b49c2e0a991c5d3ddaacbf8d2022891a36f3a (diff)
downloadgitlab-ce-rs-default-tooltip-placement.tar.gz
Fix default tooltip placementrs-default-tooltip-placement
-rw-r--r--app/assets/javascripts/application.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index bb9da147018..caf18c0d860 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -140,8 +140,8 @@ $ ->
# Place the logo tooltip on the right when collapsed, bottom when expanded
$el.parents('header').hasClass('header-collapsed') and 'right' or 'bottom'
else
- # Otherwise use the data-placement attribute like normal
- $el.data('placement')
+ # Otherwise use the data-placement attribute, or 'bottom' if undefined
+ $el.data('placement') or 'bottom'
})
# Form submitter