Merge pull request twbs#5524 from martinstein/fix-tooltip-delegate-click

fat · fat · commit 0a3e03489125 · 2012-10-17T21:34:01.000-07:00
Fix tooltip not working in delegate events on click-trigger
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
@@ -235,8 +235,9 @@
       this.enabled = !this.enabled
     }
 
-  , toggle: function () {
-      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+  , toggle: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+      self[self.tip().hasClass('in') ? 'hide' : 'show']()
     }
 
   , destroy: function () {
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
@@ -142,4 +142,12 @@ $(function () {
         ok(!$._data(tooltip[0], 'events').mouseover && !$._data(tooltip[0], 'events').mouseout, 'tooltip does not have any events')
       })
 
+      test("should show tooltip with delegate selector on click", function () {
+        var div = $('<div><a href="#" rel="tooltip" title="Another tooltip"></a></div>')
+        var tooltip = div.appendTo('#qunit-fixture')
+                         .tooltip({ selector: 'a[rel=tooltip]',
+                                    trigger: 'click' })
+        div.find('a').trigger('click')
+        ok($(".tooltip").is('.fade.in'), 'tooltip is faded in')
+      })
 })

Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,9 @@`
`235`	`235`	`this.enabled = !this.enabled`
`236`	`236`	`}`
`237`	`237`
`238`		`- , toggle: function () {`
`239`		`- this[this.tip().hasClass('in') ? 'hide' : 'show']()`
	`238`	`+ , toggle: function (e) {`
	`239`	`+ var self = $(e.currentTarget)[this.type](this._options).data(this.type)`
	`240`	`+ self[self.tip().hasClass('in') ? 'hide' : 'show']()`
`240`	`241`	`}`
`241`	`242`
`242`	`243`	`, destroy: function () {`