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.

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

[BUGFIX beta] remove trailing whitespace from model blueprint #4380

Merged
merged 1 commit into from
May 12, 2016
Merged

[BUGFIX beta] remove trailing whitespace from model blueprint #4380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion blueprints/model/files/__root__/__path__/__name__.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%= importStatements %>

export default Model.extend({
<%= attrs %>
<%= attrs.length ? ' ' + attrs : '' %>
Copy link
Member

Choose a reason for hiding this comment

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

I personally think that using an if here, might make this more readable:

export default Model.extend({
<% if (attrs) { %>
  <%= attrs %>
<% } %>
});

What do you think?

Another possibility would be to prepend the empty string within blueprints/model/index.js. We are already doing that for the needs statement, so I think this would be fine for attrs too...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@pangratz Thanks for the feedback!

The problem I run into with the if condition is that if I do pass in attrs
ember g model foo --attrs name, title
I get empty lines surrounding them:

export default Model.extend({

  name,: attr(),
  title: attr()

});

The ternary doesn't have that issue. I tried the suggestion found here: #4306 (comment) using -%> but received an Unexpected token error no matter where I used it (both for the closing if and <%= attrs -%>).

I saw that ternary used here https://github.com/emberjs/data/blob/master/blueprints/model-test/qunit-files/tests/unit/__path__/__test__.js#L5 so went that route. But I agree that it isn't that readable.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, ok. Thanks for the heads up @sbatson5. Let's leave it then the way it is, we can always change this later on.

});