diff options
| author | fat <[email protected]> | 2013-02-05 22:30:54 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-02-05 22:30:54 -0800 |
| commit | 3b56227553f40cc567e161c68c64f1e315fd5241 (patch) | |
| tree | 0ecd914f0c395b277dc46300733d8bc05ab4802e /js | |
| parent | 481428154084a9fafd31d8654157d6f6f78231d0 (diff) | |
| parent | accfdaafdbfc172f4d8358bbab820a9862bd8eb9 (diff) | |
| download | bootstrap-3b56227553f40cc567e161c68c64f1e315fd5241.tar.xz bootstrap-3b56227553f40cc567e161c68c64f1e315fd5241.zip | |
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Conflicts:
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-popover.js | 8 | ||||
| -rw-r--r-- | js/bootstrap-tooltip.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index 624eb5e31..0e7774bf6 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,5 +1,5 @@ /* =========================================================== - * bootstrap-popover.js v2.2.2 + * bootstrap-popover.js v2.3.0 * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. @@ -58,8 +58,8 @@ , $e = this.$element , o = this.options - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) + || $e.attr('data-content') return content } @@ -111,4 +111,4 @@ return this } -}(window.jQuery);
\ No newline at end of file +}(window.jQuery); diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 7a1d7254f..915a87ea8 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -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 = { |