Merge branch 'feature/cale/cms-master' into feature/christina/misc

2012-12-14 11:50:56 -05:00
parent dd7ed956dd fef3fd871e
commit cd6946088e
40 changed files with 528 additions and 362 deletions
--- a/common/static/coffee/src/discussion/tooltip_manager.coffee
+++ b/common/static/coffee/src/discussion/tooltip_manager.coffee
@@ -12,10 +12,10 @@ class @TooltipManager
      'click': @hideTooltip

  showTooltip: (e) =>
-    tooltipText = $(e.target).attr('data-tooltip')
+    $target = $(e.target).closest('[data-tooltip]')
+    tooltipText = $target.attr('data-tooltip')
    @$tooltip.html(tooltipText)
    @$body.append(@$tooltip)
-    $(e.target).children().css('pointer-events', 'none')

    tooltipCoords =
      x: e.pageX - (@$tooltip.outerWidth() / 2)
@@ -26,8 +26,8 @@ class @TooltipManager
    'top': tooltipCoords.y

    @tooltipTimer = setTimeout ()=>
-      @$tooltip.show().css('opacity', 1)

+      @$tooltip.show().css('opacity', 1)
      @tooltipTimer = setTimeout ()=>
        @hideTooltip()
      , 3000