Fixes twbs#6823: add some docs notes about tooltips in input groups

mdo · mdo · commit e3f3542d0b57 · 2013-02-06T17:25:58.000-08:00
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js
@@ -245,7 +245,7 @@
   , fixTitle: function () {
       var $e = this.$element
       if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
       }
     }
 
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
@@ -1287,7 +1287,7 @@
   , fixTitle: function () {
       var $e = this.$element
       if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
       }
     }
 
diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js
diff --git a/docs/javascript.html b/docs/javascript.html
@@ -785,6 +785,9 @@ <h3>Four directions</h3>
           </div>
 
 
+          <h3>Tooltips in input groups</h3>
+          <p>When using tooltips and popovers with the Bootstrap input groups, you'll have to set the <code>container</code> (documented below) option to avoid unwanted side effects.</p>
+
           <hr class="bs-docs-separator">
 
 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
@@ -715,6 +715,9 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           </div>{{! /example }}
 
 
+          <h3>{{_i}}Tooltips in input groups{{/i}}</h3>
+          <p>{{_i}}When using tooltips and popovers with the Bootstrap input groups, you'll have to set the <code>container</code> (documented below) option to avoid unwanted side effects.{{/i}}</p>
+
           <hr class="bs-docs-separator">
 
 

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@`
`245`	`245`	`, fixTitle: function () {`
`246`	`246`	`var $e = this.$element`
`247`	`247`	`if ($e.attr('title') \|\| typeof($e.attr('data-original-title')) != 'string') {`
`248`		`- $e.attr('data-original-title', $e.attr('title') \|\| '').removeAttr('title')`
	`248`	`+ $e.attr('data-original-title', $e.attr('title') \|\| '').attr('title', '')`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
Original file line number	Diff line number	Diff line change
`@@ -1287,7 +1287,7 @@`
`1287`	`1287`	`, fixTitle: function () {`
`1288`	`1288`	`var $e = this.$element`
`1289`	`1289`	`if ($e.attr('title') \|\| typeof($e.attr('data-original-title')) != 'string') {`
`1290`		`- $e.attr('data-original-title', $e.attr('title') \|\| '').removeAttr('title')`
	`1290`	`+ $e.attr('data-original-title', $e.attr('title') \|\| '').attr('title', '')`
`1291`	`1291`	`}`
`1292`	`1292`	`}`
`1293`	`1293`