rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-03-21 13:29:00 +01:00
Code Issues Actions 10 Packages Releases Activity

allow the use of data attributes to define popover options

Browse Source
This commit is contained in:
Jacob Thornton 2011-10-29 19:27:02 -07:00
parent ea50e8aeee
commit 640fd15464
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/javascript.html
View File

@ -555,6 +555,8 @@ $('#.tabs').bind('change', function (e) {
</tr>
</tbody>
</table>
<p><span class="label notice">Notice</span> Individual twipsy instance options can alternatively be specified through the use of data attributes.</code></p>
<pre class="prettyprint linenums">&lt;a href="#" data-placement="below" rel='twipsy' title='Some title text'&gt;text&lt;/a&gt;</pre>
<h3>Methods</h3>
<h4>$().twipsy(options)</h4>
<p>Attaches a twipsy handler to an element collection.</p>
@ -669,7 +671,7 @@ $('#.tabs').bind('change', function (e) {
<td>content</td>
<td>string, function</td>
<td>'data-content'</td>
<td>attribute or method for retrieving content text</td>
<td>a string or method for retrieving content text. if none are provided, content will be sourced from a data-content attribute.</td>
</tr>
<tr>
<td>trigger</td>
@ -679,6 +681,8 @@ $('#.tabs').bind('change', function (e) {
</tr>
</tbody>
</table>
<p><span class="label notice">Notice</span> Individual popover instance options can alternatively be specified through the use of data attributes.</code></p>
<pre class="prettyprint linenums">&lt;a data-placement="below" href="#" class="btn danger" rel="popover"&gt;text&lt;/a&gt;</pre>
<h3>Methods</h3>
<h4>$().popover(options)</h4>
<p>Initializes popovers for an element collection.</p>

4
js/bootstrap-popover.js vendored
View File

@ -47,7 +47,7 @@
, o = this.options
if (typeof this.options.content == 'string') {
content = $e.attr(o.content)
content = this.options.content
} else if (typeof this.options.content == 'function') {
content = this.options.content.call(this.$element[0])
}
@ -74,6 +74,6 @@
return this
}
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { content: 'data-content', placement: 'right'})
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, { placement: 'right'})
}( window.jQuery || window.ender );

2
js/bootstrap-twipsy.js vendored
View File

@ -299,7 +299,7 @@
}
$.fn.twipsy.elementOptions = function(ele, options) {
return $.metadata ? $.extend({}, options, $(ele).metadata()) : options
return $.extend({}, options, $(ele).data())
}
}( window.jQuery || window.ender );