element.coffee in tao_ui-0.2.10

- old
+ new

@@ -70,28 +70,28 @@
         if @autoDestroy
           @remove()
         else
           @jq.hide()
 
-      # in case the popover is hidden too fast
       if @jq.is(':visible')
-        if @jq.css('opacity') * 1 == 0
+        @on 'transitionend', (e) =>
+          return unless e.target == @
+          @off 'transitionend'
           reset()
-        else
-          @one 'transitionend', ->
-            reset()
+      else
+        reset()
     null
 
   _activeChanged: ->
     if @active
       @target.addClass 'tao-popover-active'
       @_enableAutoHide() if @autoHide
-      @trigger 'tao:show'
+      @namespacedTrigger 'show'
     else
       @target.removeClass 'tao-popover-active'
       @_disableAutoHide() if @autoHide
-      @trigger 'tao:hide'
+      @namespacedTrigger 'hide'
 
   _enableAutoHide: ->
     $(document).on "mousedown.tao-popover-#{@taoId}", (e) =>
       return unless @active
       target = e.target
@@ -151,13 +151,13 @@
     else
       @jq.hide()
       @active = false
 
   remove: ->
-    @trigger 'tao:beforeRemove'
+    @namespacedTrigger 'beforeRemove'
     @target.removeClass 'tao-popover-active'
     @jq.remove()
-    @trigger 'tao:remove'
+    @namespacedTrigger 'remove'
     @
 
   _disconnected: ->
     @triggerEl?.off '.tao-popover'
     $(document).off ".tao-popover-#{@taoId}"