From: Jacob Thornton <jacobthornton@gmail.com>
Date: Thu, 22 Mar 2012 04:35:02 +0000 (-0700)
Subject: top stripping leading and trailing whitespace + always use .html method
X-Git-Tag: v2.0.3~5^2~108^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5fb653914617d63739142f6ecef00afd4d3c796;p=thirdparty%2Fbootstrap.git

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

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b23cd19c97..e6c6aab42e 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js
index e1aa5ac391..6f389785cc 100644
--- a/docs/assets/js/bootstrap-popover.js
+++ b/docs/assets/js/bootstrap-popover.js
@@ -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
     }
 
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js
index 49b5f7286a..2b5f146b13 100644
--- a/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@ -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
     }
 
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index e1aa5ac391..6f389785cc 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -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
     }
 
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 49b5f7286a..2b5f146b13 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -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
     }