 
     # this needs to be post-super
     if @avatarPreview?
-      @on "OriginLoadComplete", (newData)=>
-        @avatarPreview.updateData newData
-      @utils.wait =>
-        @avatarPreview.updateData @getData() if @getData()?.profile.nickname?
+      @on 'TooltipReady', =>
+        @tooltip.getView()?.updateData @getData() if @getData()?.profile.nickname?
 
     @bgImg = null
 

class AvatarView extends LinkView

  constructor:(options = {},data)->


    options.cssClass or= ""
    options.size     or=


    # this needs to be pre-super
    unless options.noTooltip
      @avatarPreview =
        constructorName : AvatarTooltipView
        options :
          delegate : @
          origin : options.origin
        data : data
      # @avatarPreview = new AvatarTooltipView
      #   delegate : @
      #   origin : options.origin
      # ,data

    options.tooltip  or=
      view             : unless options.noTooltip then @avatarPreview else null
