Skip to content

Commit 2887718

Browse files
author
Robert Mosolgo
committed
Merge pull request #412 from rmosolgo/react-0-14-3
React 0.14.3
2 parents 4c85857 + 7fd6817 commit 2887718

File tree

11 files changed

+70
-41
lines changed

11 files changed

+70
-41
lines changed

‎VERSIONS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ You can control what version of React.js (and JSXTransformer) is used by `react-
99

1010
| Gem | React.js |
1111
|----------|----------|
12-
| master | 0.14.2 |
12+
| master | 0.14.3 |
13+
| 1.4.2 | 0.14.2 |
1314
| 1.4.1 | 0.14.0 |
1415
| 1.4.0 | 0.14.0 |
1516
| 1.3.3 | 0.13.3 |

‎lib/assets/react-source/development-with-addons/react-server.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
});
106106

107107
React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
108+
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;
108109

109110
module.exports = React;
110111

@@ -10455,6 +10456,7 @@
1045510456
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045610457
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045710458
name: null,
10459+
nonce: MUST_USE_ATTRIBUTE,
1045810460
noValidate: HAS_BOOLEAN_VALUE,
1045910461
open: HAS_BOOLEAN_VALUE,
1046010462
optimum: null,
@@ -10466,6 +10468,7 @@
1046610468
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1046710469
rel: null,
1046810470
required: HAS_BOOLEAN_VALUE,
10471+
reversed: HAS_BOOLEAN_VALUE,
1046910472
role: MUST_USE_ATTRIBUTE,
1047010473
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
1047110474
rowSpan: null,
@@ -18668,7 +18671,7 @@
1866818671

1866918672
'use strict';
1867018673

18671-
module.exports = '0.14.2';
18674+
module.exports = '0.14.3';
1867218675

1867318676
/***/ },
1867418677
/* 147 */
@@ -20176,6 +20179,7 @@
2017620179
if (userSpecifiedDelay) {
2017720180
// Clean-up the animation after the specified delay
2017820181
timeout = setTimeout(endListener, userSpecifiedDelay);
20182+
this.transitionTimeouts.push(timeout);
2017920183
} else {
2018020184
// DEPRECATED: this listener will be removed in a future version of react
2018120185
ReactTransitionEvents.addEndEventListener(node, endListener);
@@ -20200,12 +20204,16 @@
2020020204

2020120205
componentWillMount: function () {
2020220206
this.classNameQueue = [];
20207+
this.transitionTimeouts = [];
2020320208
},
2020420209

2020520210
componentWillUnmount: function () {
2020620211
if (this.timeout) {
2020720212
clearTimeout(this.timeout);
2020820213
}
20214+
this.transitionTimeouts.forEach(function (timeout) {
20215+
clearTimeout(timeout);
20216+
});
2020920217
},
2021020218

2021120219
componentWillAppear: function (done) {
@@ -21519,8 +21527,11 @@
2151921527
this._currentElement = element;
2152021528
},
2152121529

21522-
unmountComponent: function () {}
21530+
unmountComponent: function () {},
2152321531

21532+
getPublicInstance: function () {
21533+
return null;
21534+
}
2152421535
};
2152521536

2152621537
var ShallowComponentWrapper = function () {};

‎lib/assets/react-source/development-with-addons/react.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
});
105105

106106
React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
107+
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;
107108

108109
module.exports = React;
109110

@@ -10454,6 +10455,7 @@
1045410455
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045510456
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045610457
name: null,
10458+
nonce: MUST_USE_ATTRIBUTE,
1045710459
noValidate: HAS_BOOLEAN_VALUE,
1045810460
open: HAS_BOOLEAN_VALUE,
1045910461
optimum: null,
@@ -10465,6 +10467,7 @@
1046510467
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1046610468
rel: null,
1046710469
required: HAS_BOOLEAN_VALUE,
10470+
reversed: HAS_BOOLEAN_VALUE,
1046810471
role: MUST_USE_ATTRIBUTE,
1046910472
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
1047010473
rowSpan: null,
@@ -18667,7 +18670,7 @@
1866718670

1866818671
'use strict';
1866918672

18670-
module.exports = '0.14.2';
18673+
module.exports = '0.14.3';
1867118674

1867218675
/***/ },
1867318676
/* 147 */
@@ -20175,6 +20178,7 @@
2017520178
if (userSpecifiedDelay) {
2017620179
// Clean-up the animation after the specified delay
2017720180
timeout = setTimeout(endListener, userSpecifiedDelay);
20181+
this.transitionTimeouts.push(timeout);
2017820182
} else {
2017920183
// DEPRECATED: this listener will be removed in a future version of react
2018020184
ReactTransitionEvents.addEndEventListener(node, endListener);
@@ -20199,12 +20203,16 @@
2019920203

2020020204
componentWillMount: function () {
2020120205
this.classNameQueue = [];
20206+
this.transitionTimeouts = [];
2020220207
},
2020320208

2020420209
componentWillUnmount: function () {
2020520210
if (this.timeout) {
2020620211
clearTimeout(this.timeout);
2020720212
}
20213+
this.transitionTimeouts.forEach(function (timeout) {
20214+
clearTimeout(timeout);
20215+
});
2020820216
},
2020920217

2021020218
componentWillAppear: function (done) {
@@ -21518,8 +21526,11 @@
2151821526
this._currentElement = element;
2151921527
},
2152021528

21521-
unmountComponent: function () {}
21529+
unmountComponent: function () {},
2152221530

21531+
getPublicInstance: function () {
21532+
return null;
21533+
}
2152321534
};
2152421535

2152521536
var ShallowComponentWrapper = function () {};

‎lib/assets/react-source/development/react-server.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
});
104104

105105
React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
106+
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;
106107

107108
module.exports = React;
108109

@@ -10453,6 +10454,7 @@
1045310454
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045410455
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045510456
name: null,
10457+
nonce: MUST_USE_ATTRIBUTE,
1045610458
noValidate: HAS_BOOLEAN_VALUE,
1045710459
open: HAS_BOOLEAN_VALUE,
1045810460
optimum: null,
@@ -10464,6 +10466,7 @@
1046410466
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1046510467
rel: null,
1046610468
required: HAS_BOOLEAN_VALUE,
10469+
reversed: HAS_BOOLEAN_VALUE,
1046710470
role: MUST_USE_ATTRIBUTE,
1046810471
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
1046910472
rowSpan: null,
@@ -18666,7 +18669,7 @@
1866618669

1866718670
'use strict';
1866818671

18669-
module.exports = '0.14.2';
18672+
module.exports = '0.14.3';
1867018673

1867118674
/***/ },
1867218675
/* 147 */

‎lib/assets/react-source/development/react.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
});
102102

103103
React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
104+
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;
104105

105106
module.exports = React;
106107

@@ -10451,6 +10452,7 @@
1045110452
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045210453
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1045310454
name: null,
10455+
nonce: MUST_USE_ATTRIBUTE,
1045410456
noValidate: HAS_BOOLEAN_VALUE,
1045510457
open: HAS_BOOLEAN_VALUE,
1045610458
optimum: null,
@@ -10462,6 +10464,7 @@
1046210464
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
1046310465
rel: null,
1046410466
required: HAS_BOOLEAN_VALUE,
10467+
reversed: HAS_BOOLEAN_VALUE,
1046510468
role: MUST_USE_ATTRIBUTE,
1046610469
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
1046710470
rowSpan: null,
@@ -18664,7 +18667,7 @@
1866418667

1866518668
'use strict';
1866618669

18667-
module.exports = '0.14.2';
18670+
module.exports = '0.14.3';
1866818671

1866918672
/***/ },
1867018673
/* 147 */

‎lib/assets/react-source/production-with-addons/react-server.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/assets/react-source/production-with-addons/react.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/assets/react-source/production/react-server.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/assets/react-source/production/react.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/react/rails/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module React
22
module Rails
33
# If you change this, make sure to update VERSIONS.md
4-
VERSION = '1.4.1'
4+
VERSION = '1.4.2'
55
end
66
end

‎react-builds/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
"description": "Prepares react-rails asset files",
55
"main": "react.js",
66
"dependencies": {
7-
"react": "^0.14.2",
8-
"react-addons-clone-with-props": "^0.14.2",
9-
"react-addons-create-fragment": "^0.14.2",
10-
"react-addons-css-transition-group": "^0.14.2",
11-
"react-addons-linked-state-mixin": "^0.14.2",
12-
"react-addons-perf": "^0.14.2",
13-
"react-addons-pure-render-mixin": "^0.14.2",
14-
"react-addons-test-utils": "^0.14.2",
15-
"react-addons-transition-group": "^0.14.2",
16-
"react-addons-update": "^0.14.2",
17-
"react-dom": "^0.14.2",
7+
"react": "^0.14.3",
8+
"react-addons-clone-with-props": "^0.14.3",
9+
"react-addons-create-fragment": "^0.14.3",
10+
"react-addons-css-transition-group": "^0.14.3",
11+
"react-addons-linked-state-mixin": "^0.14.3",
12+
"react-addons-perf": "^0.14.3",
13+
"react-addons-pure-render-mixin": "^0.14.3",
14+
"react-addons-test-utils": "^0.14.3",
15+
"react-addons-transition-group": "^0.14.3",
16+
"react-addons-update": "^0.14.3",
17+
"react-dom": "^0.14.3",
1818
"webpack": "^1.12.2"
1919
}
2020
}

0 commit comments

Comments
 (0)