Skip to content

Commit 63ccb7f

Browse files
committed
Merge branch 'Havunen-master'
2 parents 7be31fc + 406a920 commit 63ccb7f

File tree

4 files changed

+6
-22
lines changed

4 files changed

+6
-22
lines changed

frameworks/keyed/inferno/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"rollup-plugin-terser": "5.1.1"
3333
},
3434
"dependencies": {
35-
"inferno": "7.2.0"
35+
"inferno": "7.2.1"
3636
}
3737
}

frameworks/keyed/inferno/src/controller.jsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import { Store } from './store.es6'
22
import { linkEvent, Component, render } from 'inferno'
33

44
function Row({ label, id, selected, deleteFunc, selectFunc }) {
5-
/*
6-
* Only <td className="col-md-1"> and <a onClick={linkEvent(id, selectFunc)}/>, nodes needs children shape flags
7-
* Because they have dynamic children. We can pre-define children type by using ChildFlags
8-
*/
95
return (
106
<tr className={selected ? 'danger' : null}>
117
<td className="col-md-1" $HasTextChildren>{id}</td>
@@ -58,7 +54,7 @@ function Header({run, runLots, add, update, clear, swapRows}) {
5854
<div className="jumbotron">
5955
<div className="row">
6056
<div className="col-md-6">
61-
<h1>Inferno - keyed</h1>
57+
<h1>Inferno</h1>
6258
</div>
6359
<div className="col-md-6">
6460
<div className="row">
@@ -168,10 +164,6 @@ export class Controller extends Component {
168164
}
169165

170166
render() {
171-
/*
172-
* Only <table> needs $HasVNodeChildren flag everything else is static
173-
* tables children is tbody so another vNode, no other flags needed
174-
*/
175167
return (
176168
<div className="container">
177169
<Header
@@ -182,7 +174,7 @@ export class Controller extends Component {
182174
clear={this.clear}
183175
swapRows={this.swapRows}
184176
/>
185-
<table className="table table-hover table-striped test-data" $HasVNodeChildren>
177+
<table className="table table-hover table-striped test-data">
186178
<tbody $HasKeyedChildren>
187179
{createRows(this.state.store, this.delete, this.select)}
188180
</tbody>

frameworks/non-keyed/inferno/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"rollup-plugin-terser": "5.1.1"
3333
},
3434
"dependencies": {
35-
"inferno": "7.2.0"
35+
"inferno": "7.2.1"
3636
}
3737
}

frameworks/non-keyed/inferno/src/controller.jsx

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import { Store } from './store.es6'
22
import { linkEvent, Component, render } from 'inferno'
33

44
function Row({ label, id, selected, deleteFunc, selectFunc }) {
5-
/*
6-
* Only <td className="col-md-1"> and <a onClick={linkEvent(id, selectFunc)}/>, nodes needs children shape flags
7-
* Because they have dynamic children. We can pre-define children type by using ChildFlags
8-
*/
95
return (
106
<tr className={selected ? 'danger' : null}>
117
<td className="col-md-1" $HasTextChildren>{id}</td>
@@ -57,7 +53,7 @@ function Header({run, runLots, add, update, clear, swapRows}) {
5753
<div className="jumbotron">
5854
<div className="row">
5955
<div className="col-md-6">
60-
<h1>Inferno - keyed</h1>
56+
<h1>Inferno</h1>
6157
</div>
6258
<div className="col-md-6">
6359
<div className="row">
@@ -167,10 +163,6 @@ export class Controller extends Component {
167163
}
168164

169165
render() {
170-
/*
171-
* Only <table> needs $HasVNodeChildren flag everything else is static
172-
* tables children is tbody so another vNode, no other flags needed
173-
*/
174166
return (
175167
<div className="container">
176168
<Header
@@ -181,7 +173,7 @@ export class Controller extends Component {
181173
clear={this.clear}
182174
swapRows={this.swapRows}
183175
/>
184-
<table className="table table-hover table-striped test-data" $HasVNodeChildren>
176+
<table className="table table-hover table-striped test-data">
185177
<tbody $HasNonKeyedChildren>
186178
{createRows(this.state.store, this.delete, this.select)}
187179
</tbody>

0 commit comments

Comments
 (0)