mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 18:44:01 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-07-17 23:34:31 -07:00
parent d3a139622e 59f847e8ee
commit 4d73aa60f9
5 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/assets/js/bootstrap.js vendored
View File

@@ -1443,11 +1443,13 @@
}
Popover.prototype.getContent = function () {
var content = typeof this.options.content == 'function' ?
this.options.content.call(this.$element[0]) :
this.options.content
var $e = this.$element
var o = this.options
return content || this.$element.attr('data-content')
return $e.attr('data-content')
|| (typeof o.content == 'function' ?
o.content.call($e[0]) :
o.content)
}
Popover.prototype.tip = function () {

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long