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

Jump to bottom

Loader component #37

Merged
merged 2 commits into from
Apr 2, 2015
Merged

Loader component #37

merged 2 commits into from
Apr 2, 2015

Conversation

mike-north
Copy link
Owner

progress

{{materialize-loader}}
{{materialize-loader mode="determinate" percent=percent}}
{{materialize-loader mode="circular"}}
{{materialize-loader mode="circular" size="small" color="blue"}}

This was referenced Apr 2, 2015
Closed
Closed
@sgasser
Copy link
Collaborator

sgasser commented Apr 2, 2015

Can you check the merge conflict?

@mike-north
Copy link
Owner Author

@sgasser merge conflicts resolved

sgasser pushed a commit that referenced this pull request Apr 2, 2015
Merge pull request #37 from truenorth/material-loader
72eece7 
Loader component
@sgasser sgasser merged commit 72eece7 into mike-north:master Apr 2, 2015
jaimevent
jaimevent reviewed Apr 2, 2015
View reviewed changes
addon/components/materialize-loader.js
barStyle: function () {
if (this.get('mode') === 'determinate') {
var pct = this.get('percent');
return `width: ${pct}%`;
Copy link
Contributor

Choose a reason for hiding this comment

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

Ember-cli crashes at this point. I'm getting the following error message:

SyntaxError: illegal character
return width: ${pct}%;

Copy link
Owner Author

Choose a reason for hiding this comment

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

You should update your Ember-cli. It now includes babel.js to transpile ES6 syntax like this template string to ES5.

@mike-north mike-north deleted the material-loader branch April 13, 2015 23:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mike-north @sgasser @jaimevent