Skip to content

fixed classnames require call #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 22, 2015
Merged

fixed classnames require call #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81af636
fixed classnames require call
mciparelli May 22, 2015
72120c9
build is being versioned, so I'm updating it too
mciparelli May 22, 2015
16472c9
fix example as well
mciparelli May 22, 2015
ed35092
make `npm test` pass
mciparelli May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/index-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

jest.dontMock('../index');
jest.dontMock('../');

var React = require('react/addons');
// var ReactTooltip = require('../index');
Expand Down
6 changes: 3 additions & 3 deletions dist/react-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ var _react = require('react');

var _react2 = _interopRequireDefault(_react);

var _classNames = require('classNames');
var _classnames = require('classnames');

var _classNames2 = _interopRequireDefault(_classNames);
var _classnames2 = _interopRequireDefault(_classnames);

var ReactTooltip = _react2['default'].createClass({

Expand Down Expand Up @@ -133,7 +133,7 @@ var ReactTooltip = _react2['default'].createClass({
top: this.state.y + offset.y + 'px'
};

var tooltipClass = (0, _classNames2['default'])('reactTooltip', { 'show': this.state.show }, { 'place-top': this.state.place === 'top' }, { 'place-bottom': this.state.place === 'bottom' }, { 'place-left': this.state.place === 'left' }, { 'place-right': this.state.place === 'right' }, { 'type-dark': this.state.type === 'dark' }, { 'type-success': this.state.type === 'success' }, { 'type-warning': this.state.type === 'warning' }, { 'type-error': this.state.type === 'error' }, { 'type-info': this.state.type === 'info' }, { 'type-light': this.state.type === 'light' });
var tooltipClass = (0, _classnames2['default'])('reactTooltip', { 'show': this.state.show }, { 'place-top': this.state.place === 'top' }, { 'place-bottom': this.state.place === 'bottom' }, { 'place-left': this.state.place === 'left' }, { 'place-right': this.state.place === 'right' }, { 'type-dark': this.state.type === 'dark' }, { 'type-success': this.state.type === 'success' }, { 'type-warning': this.state.type === 'warning' }, { 'type-error': this.state.type === 'error' }, { 'type-info': this.state.type === 'info' }, { 'type-light': this.state.type === 'light' });

return _react2['default'].createElement(
'span',
Expand Down
2 changes: 1 addition & 1 deletion example/src/react-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import classname from 'classNames';
import classname from 'classnames';

const ReactTooltip = React.createClass({

Expand Down
2 changes: 1 addition & 1 deletion src/js/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import classname from 'classNames';
import classname from 'classnames';

const ReactTooltip = React.createClass({

Expand Down