Skip to content

Commit 4a391db

Browse files
committed
3.1.7
1 parent aba7e0d commit 4a391db

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
## Change Log
22

3+
### 3.1.7 (2016/09/07 00:46 +00:00)
4+
- [#187](https://github.com/wwayne/react-tooltip/pull/187) Add disable option (@wwayne)
5+
- [#183](https://github.com/wwayne/react-tooltip/pull/183) Remove react-dom from Bower dependencies (@mikkopiu)
6+
37
### 3.1.6 (2016/08/19 02:07 +00:00)
48
- [#181](https://github.com/wwayne/react-tooltip/pull/181) Judge if the component has been mounted mount in getContent #180 (@wwayne)
59
- [#179](https://github.com/wwayne/react-tooltip/pull/179) Add bower.json (@mikkopiu)

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-tooltip",
3-
"version": "3.1.6",
3+
"version": "3.1.7",
44
"description": "react tooltip component",
55
"main": "dist/index.js",
66
"scripts": {

standalone/react-tooltip.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,9 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
550550
value: function showTooltip(e, isGlobalCall) {
551551
var _this5 = this;
552552

553+
var disabled = e.currentTarget.getAttribute('data-tip-disable') ? e.currentTarget.getAttribute('data-tip-disable') === 'true' : this.props.disable || false;
554+
if (disabled) return;
555+
553556
if (isGlobalCall) {
554557
// Don't trigger other elements belongs to other ReactTooltip
555558
var targetArray = this.getTargetArray(this.props.id);
@@ -812,7 +815,8 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
812815
getContent: _react.PropTypes.any,
813816
countTransform: _react.PropTypes.bool,
814817
afterShow: _react.PropTypes.func,
815-
afterHide: _react.PropTypes.func
818+
afterHide: _react.PropTypes.func,
819+
disable: _react.PropTypes.bool
816820
}, _temp)) || _class) || _class) || _class) || _class;
817821

818822
/* export default not fit for standalone, it will exports {default:...} */

standalone/react-tooltip.min.js

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)