Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert #14189 #15466

Merged
merged 1 commit into from
Dec 30, 2014
Merged

Revert #14189 #15466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions js/popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,12 @@

function Plugin(option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('bs.popover')
var options = typeof option == 'object' && option
var selector = options && options.selector
var $this = $(this)
var data = $this.data('bs.popover')
var options = typeof option == 'object' && option

if (!data && option == 'destroy') return
if (selector) {
if (!data) $this.data('bs.popover', (data = {}))
if (!data[selector]) data[selector] = new Popover(this, options)
} else {
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
}
if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
if (typeof option == 'string') data[option]()
})
}
Expand Down
30 changes: 0 additions & 30 deletions js/tests/unit/popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,36 +188,6 @@ $(function () {
equal($('.popover').length, 0, 'popover was removed')
})

test('should render popover elements using different delegated selectors on the same node', function () {
var popoverHTML = '<div>'
+ '<a href="#" class="first" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>'
+ '<a href="#" class="second" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>'
+ '</div>'

var $div = $(popoverHTML)
.appendTo('#qunit-fixture')
.bootstrapPopover({
selector: 'a.first',
trigger: 'click'
})
.bootstrapPopover({
selector: 'a.second',
trigger: 'click'
})

$div.find('a.first').click()
notEqual($('.popover').length, 0, 'first popover was inserted')

$div.find('a.first').click()
equal($('.popover').length, 0, 'first popover removed')

$div.find('a.second').click()
notEqual($('.popover').length, 0, 'second popover was inserted')

$div.find('a.second').click()
equal($('.popover').length, 0, 'second popover removed')
})

test('should detach popover content rather than removing it so that event handlers are left intact', function () {
var $content = $('<div class="content-with-handler"><a class="btn btn-warning">Button with event handler</a></div>').appendTo('#qunit-fixture')

Expand Down
31 changes: 0 additions & 31 deletions js/tests/unit/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,37 +235,6 @@ $(function () {
equal($('.tooltip').length, 0, 'tooltip was removed from dom')
})

test('should show tooltips with different delegate selectors on the same node on click', function () {
var tooltipHTML = '<div>'
+ '<a href="#" class="first" rel="tooltip" title="First delegated tooltip"/>'
+ '<a href="#" class="second" rel="tooltip" title="Second delegated tooltip"/>'
+ '</div>'

var $div = $(tooltipHTML)
.append()
.appendTo('#qunit-fixture')
.bootstrapTooltip({
selector: 'a.first[rel="tooltip"]',
trigger: 'click'
})
.bootstrapTooltip({
selector: 'a.second[rel="tooltip"]',
trigger: 'click'
})

$div.find('a.first').click()
ok($('.tooltip').is('.fade.in'), 'first tooltip is faded in')

$div.find('a.first').click()
equal($('.tooltip').length, 0, 'first tooltip was removed from dom')

$div.find('a.second').click()
ok($('.tooltip').is('.fade.in'), 'second tooltip is faded in')

$div.find('a.second').click()
equal($('.tooltip').length, 0, 'second tooltip was removed from dom')
})

test('should show tooltip when toggle is called', function () {
$('<a href="#" rel="tooltip" title="tooltip on toggle"/>')
.appendTo('#qunit-fixture')
Expand Down
14 changes: 4 additions & 10 deletions js/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,18 +445,12 @@

function Plugin(option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('bs.tooltip')
var options = typeof option == 'object' && option
var selector = options && options.selector
var $this = $(this)
var data = $this.data('bs.tooltip')
var options = typeof option == 'object' && option

if (!data && option == 'destroy') return
if (selector) {
if (!data) $this.data('bs.tooltip', (data = {}))
if (!data[selector]) data[selector] = new Tooltip(this, options)
} else {
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
}
if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
if (typeof option == 'string') data[option]()
})
}
Expand Down