Merge branch 'rs-default-tooltip-placement' into 'master'

Fix default tooltip placement Made a logic error in 1e1785cc that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one. See merge request !674

Merge branch 'rs-default-tooltip-placement' into 'master'
a0fcbda9 · Dmitriy Zaporozhets · d1c9a0f1 · bd85e8ea · a0fcbda9
Commit a0fcbda9 authored May 18, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

application.js.coffee app/assets/javascripts/application.js.coffee +2 -2

No files found.
--- 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