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

Code cleanup based on ESLint warnings #14603

Merged
merged 1 commit into from
Nov 12, 2016
Merged

Conversation

Turbo87
Copy link
Member

@Turbo87 Turbo87 commented Nov 11, 2016

The contents in this PR were mostly extracted from #13549

/cc @rwjblue @stefanpenner

Copy link
Member

@rwjblue rwjblue left a comment

Choose a reason for hiding this comment

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

Looks good, happy to land independently.

Can you fixup the two issues that JSCS caught, and squash the commits?

@@ -2224,16 +2218,10 @@ moduleFor('Components test: curly components', class extends RenderingTest {
}

['@test specifying classNames results in correct class'](assert) {
let clickyThing;

this.registerComponent('some-clicky-thing', {
ComponentClass: Component.extend({
tagName: 'button',
classNames: ['foo', 'bar'],
Copy link
Member

Choose a reason for hiding this comment

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

Need to remove this trailing comma

@@ -2261,15 +2249,10 @@ moduleFor('Components test: curly components', class extends RenderingTest {
}

['@test specifying custom concatenatedProperties avoids clobbering'](assert) {
let clickyThing;
this.registerComponent('some-clicky-thing', {
ComponentClass: Component.extend({
concatenatedProperties: ['blahzz'],
blahzz: ['blark', 'pory'],
Copy link
Member

Choose a reason for hiding this comment

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

trailing comma

@Turbo87
Copy link
Member Author

Turbo87 commented Nov 11, 2016

@rwjblue done

@Turbo87
Copy link
Member Author

Turbo87 commented Nov 11, 2016

also fixed the failing JSHint test now... Travis will hopefully agree :)

@Turbo87
Copy link
Member Author

Turbo87 commented Nov 11, 2016

🍏

@rwjblue
Copy link
Member

rwjblue commented Nov 11, 2016

Still need to squash commmits though

@Turbo87
Copy link
Member Author

Turbo87 commented Nov 11, 2016

@rwjblue not a fan of squashing in general, but: done!

@rwjblue rwjblue merged commit 7819409 into emberjs:master Nov 12, 2016
@rwjblue
Copy link
Member

rwjblue commented Nov 12, 2016

Thanks!

@Turbo87 Turbo87 deleted the cleanup branch November 12, 2016 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants