Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	dist/react-tooltip.js
#	dist/react-tooltip.min.js
#	standalone/react-tooltip.js
#	standalone/react-tooltip.min.js

Author: ondy1985

dist/react-tooltip.js

@@ -101,6 +101,7 @@ var ReactTooltip = function (_Component) {
       delayHide: 0,
       delayShow: 0,
       event: props.event || null,
+      eventOff: props.eventOff || null,
       isCapture: props.isCapture || false
     };
     _this.delayShowLoop = null;
@@ -171,14 +172,25 @@ var ReactTooltip = function (_Component) {
       var targetArray = this.getTargetArray();
 
       var dataEvent = void 0;
+      var dataEventOff = void 0;
       for (var i = 0; i < targetArray.length; i++) {
         if (targetArray[i].getAttribute('currentItem') === null) {
           targetArray[i].setAttribute('currentItem', 'false');
         }
         dataEvent = this.state.event || targetArray[i].getAttribute('data-event');
         if (dataEvent) {
-          targetArray[i].removeEventListener(dataEvent, this.checkStatus);
-          targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
+          dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off');
+          // if off event is specified, we will show tip on data-event and hide it on data-event-off
+          if (dataEventOff) {
+            targetArray[i].removeEventListener(dataEvent, this.showTooltip);
+            targetArray[i].addEventListener(dataEvent, this.showTooltip, false);
+
+            targetArray[i].removeEventListener(dataEventOff, this.hideTooltip);
+            targetArray[i].addEventListener(dataEventOff, this.hideTooltip, false);
+          } else {
+            targetArray[i].removeEventListener(dataEvent, this.checkStatus);
+            targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
+          }
         } else {
           targetArray[i].removeEventListener('mouseenter', this.showTooltip);
           targetArray[i].addEventListener('mouseenter', this.showTooltip, false);
@@ -757,6 +769,7 @@ ReactTooltip.propTypes = {
   delayHide: _react.PropTypes.number,
   delayShow: _react.PropTypes.number,
   event: _react.PropTypes.any,
+  eventOff: _react.PropTypes.any,
   watchWindow: _react.PropTypes.bool,
   isCapture: _react.PropTypes.bool
 };

dist/react-tooltip.min.js

@@ -153,6 +153,7 @@ var ReactTooltip = function (_Component) {
       delayHide: 0,
       delayShow: 0,
       event: props.event || null,
+      eventOff: props.eventOff || null,
       isCapture: props.isCapture || false
     };
     _this.delayShowLoop = null;
@@ -223,14 +224,25 @@ var ReactTooltip = function (_Component) {
       var targetArray = this.getTargetArray();
 
       var dataEvent = void 0;
+      var dataEventOff = void 0;
       for (var i = 0; i < targetArray.length; i++) {
         if (targetArray[i].getAttribute('currentItem') === null) {
           targetArray[i].setAttribute('currentItem', 'false');
         }
         dataEvent = this.state.event || targetArray[i].getAttribute('data-event');
         if (dataEvent) {
-          targetArray[i].removeEventListener(dataEvent, this.checkStatus);
-          targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
+          dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off');
+          // if off event is specified, we will show tip on data-event and hide it on data-event-off
+          if (dataEventOff) {
+            targetArray[i].removeEventListener(dataEvent, this.showTooltip);
+            targetArray[i].addEventListener(dataEvent, this.showTooltip, false);
+
+            targetArray[i].removeEventListener(dataEventOff, this.hideTooltip);
+            targetArray[i].addEventListener(dataEventOff, this.hideTooltip, false);
+          } else {
+            targetArray[i].removeEventListener(dataEvent, this.checkStatus);
+            targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
+          }
         } else {
           targetArray[i].removeEventListener('mouseenter', this.showTooltip);
           targetArray[i].addEventListener('mouseenter', this.showTooltip, false);
@@ -809,6 +821,7 @@ ReactTooltip.propTypes = {
   delayHide: _react.PropTypes.number,
   delayShow: _react.PropTypes.number,
   event: _react.PropTypes.any,
+  eventOff: _react.PropTypes.any,
   watchWindow: _react.PropTypes.bool,
   isCapture: _react.PropTypes.bool
 };