Merge pull request #2677 from zpao/lint-internal

Fix new lint errors
This commit is contained in:
Paul O’Shannessy
2014-12-08 12:22:06 -08:00
5 changed files with 7 additions and 5 deletions
+2
View File
@@ -9,6 +9,8 @@
* @providesModule React
*/
/* globals __REACT_DEVTOOLS_GLOBAL_HOOK__*/
"use strict";
var DOMPropertyOperations = require('DOMPropertyOperations');
+1 -1
View File
@@ -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
);
+2 -2
View File
@@ -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 ' +
@@ -1060,7 +1060,7 @@ describe('ReactCompositeComponent', function() {
});
var component = React.withContext({foo: 'noise'}, function() {
return <Component />
return <Component />;
});
ReactTestUtils.renderIntoDocument(<Parent>{component}</Parent>);
+1 -1
View File
@@ -321,7 +321,7 @@ ReactShallowRenderer.prototype.getRenderOutput = function() {
var ShallowComponentWrapper = function(inst) {
this._instance = inst;
}
};
assign(
ShallowComponentWrapper.prototype,
ReactCompositeComponent.ShallowMixin