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

Upgraded to ember 1.12.0 #485

Merged
merged 1 commit into from
Oct 15, 2015
Merged

Conversation

patsy-issa
Copy link
Contributor

Upgraded ember list view to v 0.0.6
Added SafeString to style bindings
Part of #360

@rwjblue
Copy link
Member

rwjblue commented Oct 13, 2015

We chatted a bit about this in slack, and I think we decided that the extraction of ListViewMixin and reworking the various views that extend the internal app/views/list.js is not needed.

I think that @patsy-issa is going to change that back (and confirm the tests still pass).

@patsy-issa
Copy link
Contributor Author

c changing back and adding comments to the files.

@patsy-issa patsy-issa force-pushed the upgrade-ember branch 2 times, most recently from 836a737 to cde12be Compare October 13, 2015 15:06
@rwjblue
Copy link
Member

rwjblue commented Oct 13, 2015

Looks good to me.

@teddyzeenny - r?

mouseEnter(e) {
this.get('controller').send('previewLayer', this.get('node'));
e.stopPropagation();
},

/**
* @property mouseLeave
Copy link
Contributor

Choose a reason for hiding this comment

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

s/property/method

@patsy-issa patsy-issa force-pushed the upgrade-ember branch 2 times, most recently from f9afd68 to c436c9f Compare October 15, 2015 14:06
@teddyzeenny
Copy link
Contributor

Can you remove "Moved required properties into list-view mixin" from the commit message?

Upgraded ember list view to v 0.0.6
Added SafeString to style bindings
Part of emberjs#360
@patsy-issa
Copy link
Contributor Author

Updated commit message and added SafeString to style bindings.

teddyzeenny added a commit that referenced this pull request Oct 15, 2015
@teddyzeenny teddyzeenny merged commit d3f9672 into emberjs:master Oct 15, 2015
@teddyzeenny
Copy link
Contributor

🍻

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.

None yet

3 participants