diff options
| author | Mark Otto <[email protected]> | 2013-12-18 13:01:43 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 13:01:43 -0800 |
| commit | 3f577ab86c4e07493d5d24f5fdd3dba30c199400 (patch) | |
| tree | ebce071d4991a8de6ea8440aef9093b92bb5d66b /js/tooltip.js | |
| parent | ee709db67952c53b417a172534f24034eb2a92c8 (diff) | |
| parent | ba3639b2025b8f0c510087ff8fe522c2bf0b06f1 (diff) | |
| download | bootstrap-3f577ab86c4e07493d5d24f5fdd3dba30c199400.tar.xz bootstrap-3f577ab86c4e07493d5d24f5fdd3dba30c199400.zip | |
Merge pull request #11881 from ZDroid/patch-1
Require comma on left side
Diffstat (limited to 'js/tooltip.js')
| -rw-r--r-- | js/tooltip.js | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/js/tooltip.js b/js/tooltip.js index 7b10d43a2..1cf46454b 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -36,15 +36,15 @@ } Tooltip.DEFAULTS = { - animation: true - , placement: 'top' - , selector: false - , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' - , trigger: 'hover focus' - , title: '' - , delay: 0 - , html: false - , container: false + animation: true, + placement: 'top', + selector: false, + template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>', + trigger: 'hover focus', + title: '', + delay: 0, + html: false, + container: false } Tooltip.prototype.init = function (type, element, options) { @@ -83,8 +83,8 @@ if (options.delay && typeof options.delay == 'number') { options.delay = { - show: options.delay - , hide: options.delay + show: options.delay, + hide: options.delay } } @@ -295,8 +295,8 @@ Tooltip.prototype.getPosition = function () { var el = this.$element[0] return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth - , height: el.offsetHeight + width: el.offsetWidth, + height: el.offsetHeight }, this.$element.offset()) } |
