aboutsummaryrefslogtreecommitdiff
path: root/js/src/tooltip.js
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2017-09-26 17:46:16 +0300
committerGitHub <[email protected]>2017-09-26 17:46:16 +0300
commitc090c79a709a84cb6e2bd5dbed6343ae49c861a1 (patch)
treecadb5d1e7a94588047081bb8d8c4f92914aaf043 /js/src/tooltip.js
parent8e56145e45e9d58e23c5f339b6cac50e751e36a7 (diff)
parent3eae92f1fec3c84acf38bd7e16a14eac48868334 (diff)
downloadbootstrap-c090c79a709a84cb6e2bd5dbed6343ae49c861a1.tar.xz
bootstrap-c090c79a709a84cb6e2bd5dbed6343ae49c861a1.zip
Merge branch 'v4-dev' into btn-active
Diffstat (limited to 'js/src/tooltip.js')
-rw-r--r--js/src/tooltip.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 5dc28ab7e..ca7e52b14 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -622,18 +622,18 @@ const Tooltip = (() => {
config
)
- if (config.delay && typeof config.delay === 'number') {
+ if (typeof config.delay === 'number') {
config.delay = {
show : config.delay,
hide : config.delay
}
}
- if (config.title && typeof config.title === 'number') {
+ if (typeof config.title === 'number') {
config.title = config.title.toString()
}
- if (config.content && typeof config.content === 'number') {
+ if (typeof config.content === 'number') {
config.content = config.content.toString()
}