From 001d1eaf62864c553006436d76c9b034b0bbbe82 Mon Sep 17 00:00:00 2001 From: Olena Sovyn Date: Wed, 11 May 2016 10:24:51 +0100 Subject: [PATCH] Simplify setting state on the showTooltip --- src/index.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/index.js b/src/index.js index c0a3ca5d4..1fd0fe8d9 100644 --- a/src/index.js +++ b/src/index.js @@ -261,14 +261,14 @@ class ReactTooltip extends Component { this.setState({ placeholder: tooltipText, multilineCount: multilineCount, - place: e.currentTarget.getAttribute('data-place') ? e.currentTarget.getAttribute('data-place') : (this.props.place ? this.props.place : 'top'), - type: e.currentTarget.getAttribute('data-type') ? e.currentTarget.getAttribute('data-type') : (this.props.type ? this.props.type : 'dark'), - effect: e.currentTarget.getAttribute('data-effect') ? e.currentTarget.getAttribute('data-effect') : (this.props.effect ? this.props.effect : 'float'), - offset: e.currentTarget.getAttribute('data-offset') ? e.currentTarget.getAttribute('data-offset') : (this.props.offset ? this.props.offset : {}), - html: e.currentTarget.getAttribute('data-html') ? e.currentTarget.getAttribute('data-html') : (this.props.html ? this.props.html : false), - delayShow: e.currentTarget.getAttribute('data-delay-show') ? e.currentTarget.getAttribute('data-delay-show') : (this.props.delayShow ? this.props.delayShow : 0), - delayHide: e.currentTarget.getAttribute('data-delay-hide') ? e.currentTarget.getAttribute('data-delay-hide') : (this.props.delayHide ? this.props.delayHide : 0), - border: e.currentTarget.getAttribute('data-border') ? (e.currentTarget.getAttribute('data-border') === 'true') : (this.props.border ? this.props.border : false), + place: e.currentTarget.getAttribute('data-place') || this.props.place || 'top', + type: e.currentTarget.getAttribute('data-type') || this.props.type || 'dark', + effect: e.currentTarget.getAttribute('data-effect') || this.props.effect || 'float', + offset: e.currentTarget.getAttribute('data-offset') || this.props.offset || {}, + html: e.currentTarget.getAttribute('data-html') || this.props.html || false, + delayShow: e.currentTarget.getAttribute('data-delay-show') || this.props.delayShow || 0, + delayHide: e.currentTarget.getAttribute('data-delay-hide') || this.props.delayHide || 0, + border: e.currentTarget.getAttribute('data-border') === 'true' || this.props.border || false, extraClass, multiline })