0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-28 20:52:21 +01:00

top stripping leading and trailing whitespace + always use .html method

This commit is contained in:
Jacob Thornton 2012-03-21 21:35:02 -07:00
parent 663e41d74f
commit d5fb653914
5 changed files with 4 additions and 12 deletions

Binary file not shown.

View File

@ -38,8 +38,8 @@
, title = this.getTitle()
, content = this.getContent()
$tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
$tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
$tip.find('.popover-title').html(title)
$tip.find('.popover-content > *').html(content)
$tip.removeClass('fade top bottom left right in')
}
@ -56,8 +56,6 @@
content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = content.toString().replace(/(^\s*|\s*$)/, "")
return content
}

View File

@ -206,8 +206,6 @@
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title
}

View File

@ -38,8 +38,8 @@
, title = this.getTitle()
, content = this.getContent()
$tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
$tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
$tip.find('.popover-title').html(title)
$tip.find('.popover-content > *').html(content)
$tip.removeClass('fade top bottom left right in')
}
@ -56,8 +56,6 @@
content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = content.toString().replace(/(^\s*|\s*$)/, "")
return content
}

View File

@ -206,8 +206,6 @@
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title
}