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

[BUGFIX canary] Create new hash when merging parameters hashes in components #12542

Merged
merged 1 commit into from
Nov 1, 2015

Conversation

Serabe
Copy link
Member

@Serabe Serabe commented Oct 31, 2015

When merging two parameters hashes coming from components/closure components we
want them to be merged into a new hash. This refactors does not only make this
happen but it changes mergeHash into mergeInNewHah to be explicit about
this.

Fix #12537

@stefanpenner
Copy link
Member

should likely be labeled as a bugfix

@rwjblue /@mixonic is it a bugfix beta? or..

@Serabe
Copy link
Member Author

Serabe commented Oct 31, 2015

AFAIK, this is still canary.

@Serabe Serabe changed the title Create new hash when merging parameters hashes in components [BUGFIX canary] Create new hash when merging parameters hashes in components Oct 31, 2015
@knownasilya
Copy link
Contributor

Would love to see this merged and in canary..

@sohara
Copy link

sohara commented Oct 31, 2015

👍 Confirmed that this fixes the issue in our app. Thanks, @Serabe !

@rwjblue
Copy link
Member

rwjblue commented Nov 1, 2015

@Serabe is correct, this feature is only in canary so no channel back porting needed.

export function mergeHash(original, updates) {
return assign(original, updates);
export function mergeInNewHash(original, updates) {
return assign(Object.create(original), updates);
Copy link
Member

Choose a reason for hiding this comment

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

Do we need object inheritance here? Would the following also work:

assign({}, original, updates);

…ponents

When merging two parameters hashes coming from components/closure components we
want them to be merged into a new hash. This refactors does not only make this
happen but it changes `mergeHash` into `mergeInNewHah` to be explicit about
this.

Fix emberjs#12537
@Serabe
Copy link
Member Author

Serabe commented Nov 1, 2015

@rwjblue fixed. @stefanpenner comment was because I forgot to tag it, not because of canary/beta.

@rwjblue
Copy link
Member

rwjblue commented Nov 1, 2015

Ahh, gotcha. Thanks for updating the prefix.

@rwjblue
Copy link
Member

rwjblue commented Nov 1, 2015

Looks good to me, I restarted the sauce labs job.

rwjblue added a commit that referenced this pull request Nov 1, 2015
[BUGFIX canary] Create new hash when merging parameters hashes in components
@rwjblue rwjblue merged commit 10d599e into emberjs:master Nov 1, 2015
@rwjblue
Copy link
Member

rwjblue commented Nov 1, 2015

Thanks for jumping on this so quickly @Serabe!

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

5 participants