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.

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

Fix new lint errors #2677

Merged
merged 1 commit into from
Dec 8, 2014
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/browser/ui/React.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
* @providesModule React
*/

/* globals __REACT_DEVTOOLS_GLOBAL_HOOK__*/

"use strict";

var DOMPropertyOperations = require('DOMPropertyOperations');
Expand Down
2 changes: 1 addition & 1 deletion src/browser/ui/ReactMount.js
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ var ReactMount = {
'methods are impure. React cannot handle this case due to ' +
'cross-browser quirks by rendering at the document root. You ' +
'should look for environment dependent code in your components ' +
'and ensure the props are the same client and server side:\n' +
'and ensure the props are the same client and server side:\n%s',
difference
);

Expand Down
4 changes: 2 additions & 2 deletions src/core/ReactCompositeComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -611,8 +611,8 @@ var ReactCompositeComponentMixin = assign({},
displayName
);
} else {
for (key in parentKeys) {
var key = parentKeys[key];
for (var i = 0; i < parentKeys.length; i++) {
var key = parentKeys[i];
warning(
ownerBasedContext[key] === parentBasedContext[key],
'owner-based and parent-based contexts differ ' +
Expand Down
2 changes: 1 addition & 1 deletion src/core/__tests__/ReactCompositeComponent-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ describe('ReactCompositeComponent', function() {
});

var component = React.withContext({foo: 'noise'}, function() {
return <Component />
return <Component />;
});

ReactTestUtils.renderIntoDocument(<Parent>{component}</Parent>);
Expand Down
2 changes: 1 addition & 1 deletion src/test/ReactTestUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ ReactShallowRenderer.prototype.getRenderOutput = function() {

var ShallowComponentWrapper = function(inst) {
this._instance = inst;
}
};
assign(
ShallowComponentWrapper.prototype,
ReactCompositeComponent.ShallowMixin
Expand Down