Skip to content

Commit

Permalink
Merge pull request #399 from jstettner/master
Browse files Browse the repository at this point in the history
Fixes Typos
  • Loading branch information
aronhelser authored Jul 19, 2018
2 parents f02ff35 + 02b6fef commit 86f3cf8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
- [#162](https://github.com/wwayne/react-tooltip/pull/162) Fix for #158, getposition error (@wwayne)

### 3.1.1 (2016/07/27 13:03 +00:00)
- [#151](https://github.com/wwayne/react-tooltip/pull/151) Update postion calculation so that it can calculate continous tootlip (@wwayne)
- [#151](https://github.com/wwayne/react-tooltip/pull/151) Update postion calculation so that it can calculate continous tooltip (@wwayne)

### 3.1.0 (2016/07/27 08:49 +00:00)
- [#149](https://github.com/wwayne/react-tooltip/pull/149) Update algorithm for get positon to fix the shake problem #146 (@wwayne)
Expand Down
8 changes: 4 additions & 4 deletions example/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ class Test extends React.Component {
<p className="sub-title"></p>
<div className="example-jsx">
<div className="side">
<a data-for='custom-class' data-tip='hover on me will keep the tootlip'>(・ω´・ )</a>
<a data-for='custom-class' data-tip='hover on me will keep the tooltip'>(・ω´・ )</a>
{/* <a data-for='custom-class' data-tip='' data-tip-disable='true'>empty testing</a> */}
<ReactTooltip id='custom-class' className='extraClass' delayHide={1000} effect='solid'/>
</div>
Expand All @@ -192,7 +192,7 @@ class Test extends React.Component {
<br />
<pre className='example-pre'>
<div>
<p>{"<a data-tip='hover on me will keep the tootlip'>(・ω´・ )́)</a>\n" +
<p>{"<a data-tip='hover on me will keep the tooltip'>(・ω´・ )́)</a>\n" +
"<ReactTooltip className='extraClass' delayHide={1000} effect='solid'/>\n" +
".extraClass {\n" +
" font-size: 20px !important;\n" +
Expand Down Expand Up @@ -276,15 +276,15 @@ class Test extends React.Component {
<div className="side" style={{ overflow: 'auto', height: '200px' }}>
<div data-for='scrollContent' data-tip data-iscapture='true' style={{ width: '5000px', height: '5000px' }}>
Scroll me with the mouse wheel.<br/>
The tootlip will hide.<br/>
The tooltip will hide.<br/>
Make sure you set data-iscapture="true"
</div>
<ReactTooltip id='scrollContent' getContent={() => Math.floor(Math.random() * 100)}/>
</div>
<div className="side" style={{ overflow: 'auto', height: '200px' }}>
<div data-for='scrollTime' data-tip data-iscapture='true' data-scroll-hide='false' style={{ width: '5000px', height: '5000px' }}>
Scroll me with the mouse wheel.<br/>
The tootlip will stay visible.
The tooltip will stay visible.
</div>
<ReactTooltip id='scrollTime'
getContent={[() => {return new Date().toISOString()}, 1000]}/>
Expand Down

0 comments on commit 86f3cf8

Please sign in to comment.