Skip to content

Commit

Permalink
3.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
wwayne committed Sep 7, 2016
1 parent aba7e0d commit 4a391db
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Change Log

### 3.1.7 (2016/09/07 00:46 +00:00)
- [#187](https://github.com/wwayne/react-tooltip/pull/187) Add disable option (@wwayne)
- [#183](https://github.com/wwayne/react-tooltip/pull/183) Remove react-dom from Bower dependencies (@mikkopiu)

### 3.1.6 (2016/08/19 02:07 +00:00)
- [#181](https://github.com/wwayne/react-tooltip/pull/181) Judge if the component has been mounted mount in getContent #180 (@wwayne)
- [#179](https://github.com/wwayne/react-tooltip/pull/179) Add bower.json (@mikkopiu)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tooltip",
"version": "3.1.6",
"version": "3.1.7",
"description": "react tooltip component",
"main": "dist/index.js",
"scripts": {
Expand Down
6 changes: 5 additions & 1 deletion standalone/react-tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,9 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
value: function showTooltip(e, isGlobalCall) {
var _this5 = this;

var disabled = e.currentTarget.getAttribute('data-tip-disable') ? e.currentTarget.getAttribute('data-tip-disable') === 'true' : this.props.disable || false;
if (disabled) return;

if (isGlobalCall) {
// Don't trigger other elements belongs to other ReactTooltip
var targetArray = this.getTargetArray(this.props.id);
Expand Down Expand Up @@ -812,7 +815,8 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
getContent: _react.PropTypes.any,
countTransform: _react.PropTypes.bool,
afterShow: _react.PropTypes.func,
afterHide: _react.PropTypes.func
afterHide: _react.PropTypes.func,
disable: _react.PropTypes.bool
}, _temp)) || _class) || _class) || _class) || _class;

/* export default not fit for standalone, it will exports {default:...} */
Expand Down
5 changes: 2 additions & 3 deletions standalone/react-tooltip.min.js

Large diffs are not rendered by default.

0 comments on commit 4a391db

Please sign in to comment.