Skip to content

Commit 5081b3c

Browse files
React 0.12 support
1 parent 5c72ab0 commit 5081b3c

182 files changed

Lines changed: 13510 additions & 10350 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gruntfile.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ module.exports = function (grunt) {
55

66
amdwrap: {
77
src: {
8+
expand: true,
9+
cwd: 'src/',
10+
src: ['**/*.js'],
11+
dest: 'amd/'
12+
},
13+
transpiled: {
814
expand: true,
915
cwd: 'transpiled/',
1016
src: ['**/*.js'],
@@ -31,6 +37,12 @@ module.exports = function (grunt) {
3137
src: ['**/*.js'],
3238
dest: 'cjs/'
3339
},
40+
{
41+
expand: true,
42+
cwd: 'src/',
43+
src: ['**/*.js'],
44+
dest: 'cjs/'
45+
},
3446
{
3547
src: ['**/*'],
3648
dest: 'cjs/',
@@ -52,7 +64,7 @@ module.exports = function (grunt) {
5264
{
5365
expand: true,
5466
cwd: 'src',
55-
src: ['**/*.*'],
67+
src: ['**/*.jsx'],
5668
dest: 'transpiled',
5769
ext: '.js'
5870
}
@@ -63,7 +75,7 @@ module.exports = function (grunt) {
6375
{
6476
expand: true,
6577
cwd: 'test',
66-
src: ['**/*.*'],
78+
src: ['**/*.jsx'],
6779
dest: 'test-built',
6880
ext: '.js'
6981
}

docs/client.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ var Root = require('./src/Root');
66
// For React devtools
77
window.React = React;
88

9-
React.renderComponent(Root(window.INITIAL_PROPS), document);
9+
React.render(Root(window.INITIAL_PROPS), document);

docs/examples/AlertAutoDismissable.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var AlertAutoDismissable = React.createClass({
42
getInitialState: function() {
53
return {
@@ -31,4 +29,4 @@ var AlertAutoDismissable = React.createClass({
3129
}
3230
});
3331

34-
React.renderComponent(<AlertAutoDismissable />, mountNode);
32+
React.render(<AlertAutoDismissable />, mountNode);

docs/examples/AlertBasic.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
/** @jsx React.DOM */
2-
31
var alertInstance = (
42
<Alert bsStyle="warning">
53
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
64
</Alert>
75
);
86

9-
React.renderComponent(alertInstance, mountNode);
7+
React.render(alertInstance, mountNode);

docs/examples/AlertDismissable.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var AlertDismissable = React.createClass({
42
getInitialState: function() {
53
return {
@@ -35,4 +33,4 @@ var AlertDismissable = React.createClass({
3533
}
3634
});
3735

38-
React.renderComponent(<AlertDismissable />, mountNode);
36+
React.render(<AlertDismissable />, mountNode);

docs/examples/Badge.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
/** @jsx React.DOM */
2-
31
var badgeInstance = (
42
<p>Badges <Badge>42</Badge></p>
53
);
64

7-
React.renderComponent(badgeInstance, mountNode);
5+
React.render(badgeInstance, mountNode);

docs/examples/ButtonActive.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
/** @jsx React.DOM */
2-
31
var buttonsInstance = (
42
<ButtonToolbar>
53
<Button bsStyle="primary" bsSize="large" active>Primary button</Button>
64
<Button bsSize="large" active>Button</Button>
75
</ButtonToolbar>
86
);
97

10-
React.renderComponent(buttonsInstance, mountNode);
8+
React.render(buttonsInstance, mountNode);

docs/examples/ButtonBlock.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/** @jsx React.DOM */
21
var wellStyles = {maxWidth: 400, margin: '0 auto 10px'};
32

43
var buttonsInstance = (
@@ -8,4 +7,4 @@ var buttonsInstance = (
87
</div>
98
);
109

11-
React.renderComponent(buttonsInstance, mountNode);
10+
React.render(buttonsInstance, mountNode);

docs/examples/ButtonDisabled.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
/** @jsx React.DOM */
2-
31
var buttonsInstance = (
42
<ButtonToolbar>
53
<Button bsStyle="primary" bsSize="large" disabled>Primary button</Button>
64
<Button bsSize="large" disabled>Button</Button>
75
</ButtonToolbar>
86
);
97

10-
React.renderComponent(buttonsInstance, mountNode);
8+
React.render(buttonsInstance, mountNode);

docs/examples/ButtonGroupBasic.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var buttonGroupInstance = (
42
<ButtonGroup>
53
<Button>Left</Button>
@@ -8,4 +6,4 @@ var buttonGroupInstance = (
86
</ButtonGroup>
97
);
108

11-
React.renderComponent(buttonGroupInstance, mountNode);
9+
React.render(buttonGroupInstance, mountNode);

0 commit comments

Comments
 (0)