From 6a9f169fd6cd2203dee3f6230cc78f5dbbeafdab Mon Sep 17 00:00:00 2001 From: Nicklas Ansman Giertz Date: Sun, 22 Jan 2012 12:06:59 +0100 Subject: [PATCH 1/3] Make the popove respect custom classes --- js/bootstrap-popover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index e908998952..a0de0f08dc 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -41,7 +41,7 @@ $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - $tip[0].className = 'popover' + $tip.removeClass('fade top bottom left right in') } , hasContent: function () { @@ -92,4 +92,4 @@ , template: '

' }) -}( window.jQuery ) \ No newline at end of file +}( window.jQuery ) From 05fdd43e41bae02c8d4006c075b6360599b4467c Mon Sep 17 00:00:00 2001 From: Nicklas Ansman Giertz Date: Sun, 22 Jan 2012 12:32:37 +0100 Subject: [PATCH 2/3] Add testcase to popover This test case verifies that custom classes are respected. --- js/tests/unit/bootstrap-popover.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js index 9180c043e9..462db8b3e1 100644 --- a/js/tests/unit/bootstrap-popover.js +++ b/js/tests/unit/bootstrap-popover.js @@ -70,5 +70,24 @@ $(function () { ok(!$('.popover').length, 'popover was removed') $('#qunit-fixture').empty() }) + + test("should respect custom classes", function() { + $.support.transition = false + var popover = $('@fat') + .appendTo('#qunit-fixture') + .popover({ + title: 'Test' + , content: 'Test' + , template: '

' + }) + + popover.popover('show') + console.log(popover) + ok($('.popover').length, 'popover was inserted') + ok($('.popover').hasClass('foobar'), 'custom class is present') + popover.popover('hide') + ok(!$('.popover').length, 'popover was removed') + $('#qunit-fixture').empty() + }) }) \ No newline at end of file From 4882e6da2f887c1e8baad96f777b151882adaed8 Mon Sep 17 00:00:00 2001 From: Nicklas Ansman Giertz Date: Sun, 22 Jan 2012 12:33:30 +0100 Subject: [PATCH 3/3] Rename the tooltip test file It had not been renamed when twipsys became tooltips. --- js/tests/unit/{bootstrap-twipsy.js => bootstrap-tooltip.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename js/tests/unit/{bootstrap-twipsy.js => bootstrap-tooltip.js} (100%) diff --git a/js/tests/unit/bootstrap-twipsy.js b/js/tests/unit/bootstrap-tooltip.js similarity index 100% rename from js/tests/unit/bootstrap-twipsy.js rename to js/tests/unit/bootstrap-tooltip.js