Skip to content

B
bootstrap
Commit d5fb6539 authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

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

parent 663e41d7
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
docs/assets/js/bootstrap-popover.js
View file @ d5fb6539
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
, title = this.getTitle() , title = this.getTitle()
, content = this.getContent() , content = this.getContent()
$tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) $tip.find('.popover-title').html(title)
$tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) $tip.find('.popover-content > *').html(content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade top bottom left right in')
} }
...@@ -56,8 +56,6 @@ ...@@ -56,8 +56,6 @@
content = $e.attr('data-content') content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = content.toString().replace(/(^\s*|\s*$)/, "")
return content return content
} }
......
docs/assets/js/bootstrap-tooltip.js
View file @ d5fb6539
...@@ -206,8 +206,6 @@ ...@@ -206,8 +206,6 @@
title = $e.attr('data-original-title') title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title return title
} }
......
js/bootstrap-popover.js
View file @ d5fb6539
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
, title = this.getTitle() , title = this.getTitle()
, content = this.getContent() , content = this.getContent()
$tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) $tip.find('.popover-title').html(title)
$tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) $tip.find('.popover-content > *').html(content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade top bottom left right in')
} }
...@@ -56,8 +56,6 @@ ...@@ -56,8 +56,6 @@
content = $e.attr('data-content') content = $e.attr('data-content')
|| (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
content = content.toString().replace(/(^\s*|\s*$)/, "")
return content return content
} }
......
js/bootstrap-tooltip.js
View file @ d5fb6539
...@@ -206,8 +206,6 @@ ...@@ -206,8 +206,6 @@
title = $e.attr('data-original-title') title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title return title
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment