Skip to content

Fix line lengths and test for lint/test passing. #6909

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.

Sign up for GitHub

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
gaearon merged 4 commits into from
May 28, 2016
Merged

Fix line lengths and test for lint/test passing. #6909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b47ef0
Fix line lengths and test for lint/test passing.
lexjacobs May 27, 2016
eec362e
Adjust line breaks to match reviewer feedback.
lexjacobs May 28, 2016
3137e59
Adjust line breaks to match reviewer feedback.
lexjacobs May 28, 2016
78582ee
Adjust line breaks to match reviewer feedback.
lexjacobs May 28, 2016
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
18 changes: 15 additions & 3 deletions src/renderers/dom/client/syntheticEvents/SyntheticEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,21 @@ Object.assign(SyntheticEvent.prototype, {
this[shouldBeReleasedProperties[i]] = null;
}
if (__DEV__) {
Object.defineProperty(this, 'nativeEvent', getPooledWarningPropertyDefinition('nativeEvent', null));
Object.defineProperty(this, 'preventDefault', getPooledWarningPropertyDefinition('preventDefault', emptyFunction));
Object.defineProperty(this, 'stopPropagation', getPooledWarningPropertyDefinition('stopPropagation', emptyFunction));
Object.defineProperty(
this,
'nativeEvent',
getPooledWarningPropertyDefinition('nativeEvent', null)
);
Object.defineProperty(
this,
'preventDefault',
getPooledWarningPropertyDefinition('preventDefault', emptyFunction)
);
Object.defineProperty(
this,
'stopPropagation',
getPooledWarningPropertyDefinition('stopPropagation', emptyFunction)
);
}
},

Expand Down
2 changes: 1 addition & 1 deletion src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ describe('ReactDOMComponent', function() {
});

ReactTestUtils.renderIntoDocument(<Component />);
expect(console.error.calls.length).toBe(0);
expect(console.error.calls.count()).toBe(0);
});

it('should warn nicely about NaN in style', function() {
Expand Down
4 changes: 3 additions & 1 deletion src/renderers/native/ReactNativeAttributePayload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,9 @@ function diffProperties(
// default: fallthrough case when nested properties are defined
removedKeys = null;
removedKeyCount = 0;
// $FlowFixMe - We think that attributeConfig is not CustomAttributeConfiguration at this point so we assume it must be AttributeConfiguration.
// $FlowFixMe - We think that attributeConfig is not
// CustomAttributeConfiguration at this point so we assume
// it must be AttributeConfiguration.
updatePayload = diffNestedProperty(
updatePayload,
prevProp,
Expand Down
7 changes: 6 additions & 1 deletion src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ export type ReactYield = {
continuation: mixed
};

exports.createCoroutine = function<T>(children : mixed, handler : CoroutineHandler<T>, props : T, key : ?string = null) : ReactCoroutine {
exports.createCoroutine = function<T>(
Copy link
Collaborator

@gaearon gaearon May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We generally wrap long arg lists like this, can you tweak it?

Copy link
Contributor Author

@lexjacobs lexjacobs May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, no problem. To avoid an extra commit, will it work for me to amend the commit and force push to my fork? Or I can make a new pull request. What do you prefer?

Copy link
Contributor

@keyz keyz May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GitHub supports "squash and merge" now so feel free to add a new commit.

Copy link
Contributor Author

@lexjacobs lexjacobs May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adjusted line breaks to match reviewer feedback.

children : mixed,
handler : CoroutineHandler<T>,
props : T,
key : ?string = null
) : ReactCoroutine {
var coroutine = {
// This tag allow us to uniquely identify this as a React Coroutine
$$typeof: REACT_COROUTINE_TYPE,
Expand Down