mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
fat
2013-02-05 22:30:54 -08:00
parent 4814281540 accfdaafdb
commit 3b56227553
11 changed files with 47 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap-tooltip.js vendored
View File

@@ -67,7 +67,7 @@
}
, getOptions: function (options) {
options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
if (options.delay && typeof options.delay == 'number') {
options.delay = {