Skip to content

React 0.14.3 #412

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.

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 2 commits into from
Nov 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ You can control what version of React.js (and JSXTransformer) is used by `react-

| Gem | React.js |
|----------|----------|
| master | 0.14.2 |
| master | 0.14.3 |
| 1.4.2 | 0.14.2 |
| 1.4.1 | 0.14.0 |
| 1.4.0 | 0.14.0 |
| 1.3.3 | 0.13.3 |
Expand Down
15 changes: 13 additions & 2 deletions lib/assets/react-source/development-with-addons/react-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
});

React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;

module.exports = React;

Expand Down Expand Up @@ -10455,6 +10456,7 @@
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
name: null,
nonce: MUST_USE_ATTRIBUTE,
noValidate: HAS_BOOLEAN_VALUE,
open: HAS_BOOLEAN_VALUE,
optimum: null,
Expand All @@ -10466,6 +10468,7 @@
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
rel: null,
required: HAS_BOOLEAN_VALUE,
reversed: HAS_BOOLEAN_VALUE,
role: MUST_USE_ATTRIBUTE,
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
rowSpan: null,
Expand Down Expand Up @@ -18668,7 +18671,7 @@

'use strict';

module.exports = '0.14.2';
module.exports = '0.14.3';

/***/ },
/* 147 */
Expand Down Expand Up @@ -20176,6 +20179,7 @@
if (userSpecifiedDelay) {
// Clean-up the animation after the specified delay
timeout = setTimeout(endListener, userSpecifiedDelay);
this.transitionTimeouts.push(timeout);
} else {
// DEPRECATED: this listener will be removed in a future version of react
ReactTransitionEvents.addEndEventListener(node, endListener);
Expand All @@ -20200,12 +20204,16 @@

componentWillMount: function () {
this.classNameQueue = [];
this.transitionTimeouts = [];
},

componentWillUnmount: function () {
if (this.timeout) {
clearTimeout(this.timeout);
}
this.transitionTimeouts.forEach(function (timeout) {
clearTimeout(timeout);
});
},

componentWillAppear: function (done) {
Expand Down Expand Up @@ -21519,8 +21527,11 @@
this._currentElement = element;
},

unmountComponent: function () {}
unmountComponent: function () {},

getPublicInstance: function () {
return null;
}
};

var ShallowComponentWrapper = function () {};
Expand Down
15 changes: 13 additions & 2 deletions lib/assets/react-source/development-with-addons/react.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
});

React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;

module.exports = React;

Expand Down Expand Up @@ -10454,6 +10455,7 @@
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
name: null,
nonce: MUST_USE_ATTRIBUTE,
noValidate: HAS_BOOLEAN_VALUE,
open: HAS_BOOLEAN_VALUE,
optimum: null,
Expand All @@ -10465,6 +10467,7 @@
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
rel: null,
required: HAS_BOOLEAN_VALUE,
reversed: HAS_BOOLEAN_VALUE,
role: MUST_USE_ATTRIBUTE,
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
rowSpan: null,
Expand Down Expand Up @@ -18667,7 +18670,7 @@

'use strict';

module.exports = '0.14.2';
module.exports = '0.14.3';

/***/ },
/* 147 */
Expand Down Expand Up @@ -20175,6 +20178,7 @@
if (userSpecifiedDelay) {
// Clean-up the animation after the specified delay
timeout = setTimeout(endListener, userSpecifiedDelay);
this.transitionTimeouts.push(timeout);
} else {
// DEPRECATED: this listener will be removed in a future version of react
ReactTransitionEvents.addEndEventListener(node, endListener);
Expand All @@ -20199,12 +20203,16 @@

componentWillMount: function () {
this.classNameQueue = [];
this.transitionTimeouts = [];
},

componentWillUnmount: function () {
if (this.timeout) {
clearTimeout(this.timeout);
}
this.transitionTimeouts.forEach(function (timeout) {
clearTimeout(timeout);
});
},

componentWillAppear: function (done) {
Expand Down Expand Up @@ -21518,8 +21526,11 @@
this._currentElement = element;
},

unmountComponent: function () {}
unmountComponent: function () {},

getPublicInstance: function () {
return null;
}
};

var ShallowComponentWrapper = function () {};
Expand Down
5 changes: 4 additions & 1 deletion lib/assets/react-source/development/react-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
});

React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;

module.exports = React;

Expand Down Expand Up @@ -10453,6 +10454,7 @@
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
name: null,
nonce: MUST_USE_ATTRIBUTE,
noValidate: HAS_BOOLEAN_VALUE,
open: HAS_BOOLEAN_VALUE,
optimum: null,
Expand All @@ -10464,6 +10466,7 @@
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
rel: null,
required: HAS_BOOLEAN_VALUE,
reversed: HAS_BOOLEAN_VALUE,
role: MUST_USE_ATTRIBUTE,
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
rowSpan: null,
Expand Down Expand Up @@ -18666,7 +18669,7 @@

'use strict';

module.exports = '0.14.2';
module.exports = '0.14.3';

/***/ },
/* 147 */
Expand Down
5 changes: 4 additions & 1 deletion lib/assets/react-source/development/react.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
});

React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOM;
React.__SECRET_DOM_SERVER_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = ReactDOMServer;

module.exports = React;

Expand Down Expand Up @@ -10451,6 +10452,7 @@
multiple: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
muted: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
name: null,
nonce: MUST_USE_ATTRIBUTE,
noValidate: HAS_BOOLEAN_VALUE,
open: HAS_BOOLEAN_VALUE,
optimum: null,
Expand All @@ -10462,6 +10464,7 @@
readOnly: MUST_USE_PROPERTY | HAS_BOOLEAN_VALUE,
rel: null,
required: HAS_BOOLEAN_VALUE,
reversed: HAS_BOOLEAN_VALUE,
role: MUST_USE_ATTRIBUTE,
rows: MUST_USE_ATTRIBUTE | HAS_POSITIVE_NUMERIC_VALUE,
rowSpan: null,
Expand Down Expand Up @@ -18664,7 +18667,7 @@

'use strict';

module.exports = '0.14.2';
module.exports = '0.14.3';

/***/ },
/* 147 */
Expand Down
12 changes: 6 additions & 6 deletions lib/assets/react-source/production-with-addons/react-server.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions lib/assets/react-source/production-with-addons/react.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions lib/assets/react-source/production/react-server.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions lib/assets/react-source/production/react.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/react/rails/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module React
module Rails
# If you change this, make sure to update VERSIONS.md
VERSION = '1.4.1'
VERSION = '1.4.2'
end
end
22 changes: 11 additions & 11 deletions react-builds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"description": "Prepares react-rails asset files",
"main": "react.js",
"dependencies": {
"react": "^0.14.2",
"react-addons-clone-with-props": "^0.14.2",
"react-addons-create-fragment": "^0.14.2",
"react-addons-css-transition-group": "^0.14.2",
"react-addons-linked-state-mixin": "^0.14.2",
"react-addons-perf": "^0.14.2",
"react-addons-pure-render-mixin": "^0.14.2",
"react-addons-test-utils": "^0.14.2",
"react-addons-transition-group": "^0.14.2",
"react-addons-update": "^0.14.2",
"react-dom": "^0.14.2",
"react": "^0.14.3",
"react-addons-clone-with-props": "^0.14.3",
"react-addons-create-fragment": "^0.14.3",
"react-addons-css-transition-group": "^0.14.3",
"react-addons-linked-state-mixin": "^0.14.3",
"react-addons-perf": "^0.14.3",
"react-addons-pure-render-mixin": "^0.14.3",
"react-addons-test-utils": "^0.14.3",
"react-addons-transition-group": "^0.14.3",
"react-addons-update": "^0.14.3",
"react-dom": "^0.14.3",
"webpack": "^1.12.2"
}
}