fix(isCapture): better guard that preserves logic

jafin · Jun 4, 2018 · 28b8493 · 28b8493
1 parent 99bf5ec
commit 28b8493
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/decorators/isCapture.js b/src/decorators/isCapture.js
@@ -4,8 +4,6 @@
 
 export default function (target) {
   target.prototype.isCapture = function (currentTarget) {
-    if (!currentTarget) return false
-    const dataIsCapture = currentTarget.getAttribute('data-iscapture')
-    return dataIsCapture && dataIsCapture === 'true' || this.props.isCapture || false
+    return (currentTarget && currentTarget.getAttribute('data-iscapture') === 'true') || this.props.isCapture || false
   }
 }
diff --git a/standalone/react-tooltip.js b/standalone/react-tooltip.js
@@ -1349,9 +1349,7 @@ Object.defineProperty(exports, "__esModule", {
 
 exports.default = function (target) {
   target.prototype.isCapture = function (currentTarget) {
-    if (!currentTarget) return false;
-    var dataIsCapture = currentTarget.getAttribute('data-iscapture');
-    return dataIsCapture && dataIsCapture === 'true' || this.props.isCapture || false;
+    return currentTarget && currentTarget.getAttribute('data-iscapture') === 'true' || this.props.isCapture || false;
   };
 };