@@ -60,21 +60,21 @@ export const defaultOptions = {
6060
6161export function getOptions ( options ) {
6262 const result = {
63- placement : options . placement || directive . options . defaultPlacement ,
64- delay : options . delay || directive . options . defaultDelay ,
65- template : options . template || directive . options . defaultTemplate ,
66- trigger : options . trigger || directive . options . defaultTrigger ,
67- offset : options . offset || directive . options . defaultOffset ,
68- container : options . container || directive . options . defaultContainer ,
69- boundariesElement : options . boundariesElement || directive . options . defaultBoundariesElement ,
63+ placement : typeof options . placement !== 'undefined' ? options . placement : directive . options . defaultPlacement ,
64+ delay : typeof options . delay !== 'undefined' ? options . delay : directive . options . defaultDelay ,
65+ template : typeof options . template !== 'undefined' ? options . template : directive . options . defaultTemplate ,
66+ trigger : typeof options . trigger !== 'undefined' ? options . trigger : directive . options . defaultTrigger ,
67+ offset : typeof options . offset !== 'undefined' ? options . offset : directive . options . defaultOffset ,
68+ container : typeof options . container !== 'undefined' ? options . container : directive . options . defaultContainer ,
69+ boundariesElement : typeof options . boundariesElement !== 'undefined' ? options . boundariesElement : directive . options . defaultBoundariesElement ,
7070 popperOptions : {
71- ...( options . popperOptions || directive . options . defaultPopperOptions ) ,
71+ ...( typeof options . popperOptions !== 'undefined' ? options . popperOptions : directive . options . defaultPopperOptions ) ,
7272 } ,
7373 }
7474
75- if ( options . offset ) {
76- const typeofOffset = typeof options . offset
77- let offset = options . offset
75+ if ( result . offset ) {
76+ const typeofOffset = typeof result . offset
77+ let offset = result . offset
7878
7979 // One value -> switch
8080 if ( typeofOffset === 'number' || ( typeofOffset === 'string' && offset . indexOf ( ',' ) === - 1 ) ) {
@@ -116,7 +116,7 @@ function getContent (value) {
116116
117117function createTooltip ( el , value , modifiers ) {
118118 const content = getContent ( value )
119- let classes = value . classes || directive . options . defaultClass
119+ let classes = typeof value . classes !== 'undefined' ? value . classes : directive . options . defaultClass
120120 const opts = {
121121 title : content ,
122122 html : true ,
0 commit comments