diff options
| author | Jacob Thornton <[email protected]> | 2012-08-18 19:54:30 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-18 19:54:30 -0700 |
| commit | 45dddc59a19f3e9decaa4bf0e0db3f884a0f6ff7 (patch) | |
| tree | 39616e8cd0f2c6b5f7c94a90a8e637ce263137c3 /js | |
| parent | 44e35e9dfa33fe618218c770f0495bd9596f3485 (diff) | |
| download | bootstrap-45dddc59a19f3e9decaa4bf0e0db3f884a0f6ff7.tar.xz bootstrap-45dddc59a19f3e9decaa4bf0e0db3f884a0f6ff7.zip | |
add click option for tooltip, popover - make click default for popover
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-popover.js | 1 | ||||
| -rw-r--r-- | js/bootstrap-tooltip.js | 6 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-popover.js | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index b7883c5d2..bbf0ba4bc 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -95,6 +95,7 @@ $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { placement: 'right' + , trigger: 'click' , content: '' , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>' }) diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 1e681627a..0b3230bc1 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -44,8 +44,10 @@ this.options = this.getOptions(options) this.enabled = true - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' + if (this.options.trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (this.options.trigger != 'manual') { + eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js index daffe215c..04d5279d2 100644 --- a/js/tests/unit/bootstrap-popover.js +++ b/js/tests/unit/bootstrap-popover.js @@ -92,7 +92,7 @@ $(function () { }) test("should destroy popover", function () { - var popover = $('<div/>').popover().on('click.foo', function(){}) + var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function(){}) ok(popover.data('popover'), 'popover has data') ok(popover.data('events').mouseover && popover.data('events').mouseout, 'popover has hover event') ok(popover.data('events').click[0].namespace == 'foo', 'popover has extra click.foo event') |