1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 21:39:08 +02:00

don't include data-content/data-title as specifications for options in twipsy/popover

This commit is contained in:
Jacob Thornton
2011-11-06 13:49:00 -08:00
parent c3c700fd02
commit b15e24e3d4
3 changed files with 17 additions and 3 deletions

View File

@@ -51,10 +51,11 @@
, o = this.options
if (typeof this.options.content == 'string') {
content = this.options.content
content = $e.attr(this.options.content)
} else if (typeof this.options.content == 'function') {
content = this.options.content.call(this.$element[0])
}
return content
}
@@ -80,7 +81,10 @@
$.fn.popover.defaults = $.extend({} , $.fn.twipsy.defaults, {
placement: 'right'
, content: 'data-content'
, template: '<div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div>'
})
$.fn.twipsy.rejectAttrOptions.push( 'content' )
}( window.jQuery || window.ender );