Skip to content
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

Jump to bottom

React hot loader compatibility #1

Merged
merged 2 commits into from
Jul 30, 2018
Merged

React hot loader compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74c9d02
Compare child type function string instead of function literal
connorzg Jul 16, 2018
358f845
Update build and testing modules
connorzg Jul 16, 2018
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
8 changes: 4 additions & 4 deletions build/reactable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,16 +1093,16 @@ window.ReactDOM["default"] = window.ReactDOM;
return;
}

switch (child.type) {
case _thead.Thead:
switch ('' + child.type) {
case '' + _thead.Thead:
break;
case _tfoot.Tfoot:
case '' + _tfoot.Tfoot:
if (typeof tfoot !== 'undefined') {
console.warn('You can only have one <Tfoot>, but more than one was specified.' + 'Ignoring all but the last one');
}
tfoot = child;
break;
case _tr.Tr:
case '' + _tr.Tr:
var childData = child.props.data || {};

_react['default'].Children.forEach(child.props.children, function (descendant) {
Expand Down
8 changes: 4 additions & 4 deletions lib/reactable/table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,16 +100,16 @@ var Table = (function (_React$Component) {
return;
}

switch (child.type) {
case _thead.Thead:
switch (`${child.type}`) {
case `${_thead.Thead}`:
break;
case _tfoot.Tfoot:
case `${_tfoot.Tfoot}`:
if (typeof tfoot !== 'undefined') {
console.warn('You can only have one <Tfoot>, but more than one was specified.' + 'Ignoring all but the last one');
}
tfoot = child;
break;
case _tr.Tr:
case `${_tr.Tr}`:
var childData = child.props.data || {};

_react2['default'].Children.forEach(child.props.children, function (descendant) {
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-watch": "^0.6.1",
"grunt-file-append": "0.0.6",
"grunt-karma": "^0.8.2",
"grunt-karma": "^0.12.2",
"grunt-react": "^0.10.0",
"karma": "^0.12.9",
"karma": "^1.6.0",
"karma-chrome-launcher": "^0.1.3",
"karma-firefox-launcher": "^0.1.3",
"karma-mocha": "^0.1.3",
"karma-phantomjs-launcher": "^0.1.4",
"karma-phantomjs-launcher": "^1.0.4",
"karma-spec-reporter": "0.0.12",
"load-grunt-tasks": "^3.2.0",
"markdownlint": "0.0.7",
Expand Down
8 changes: 4 additions & 4 deletions src/reactable/table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ export class Table extends React.Component {
return;
}

switch (child.type) {
case Thead:
switch (`${child.type}`) {
case `${Thead}`:
break;
case Tfoot:
case `${Tfoot}`:
if (typeof(tfoot) !== 'undefined') {
console.warn ('You can only have one <Tfoot>, but more than one was specified.' +
'Ignoring all but the last one');
}
tfoot = child;
break;
case Tr:
case `${Tr}`:
let childData = child.props.data || {};

React.Children.forEach(child.props.children, function(descendant) {
Expand Down