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 release-1-13] Prevent classNames from being duplicated. #12784

Merged
merged 2 commits into from
Jan 8, 2016
Merged

[BUGFIX release-1-13] Prevent classNames from being duplicated. #12784

merged 2 commits into from
Jan 8, 2016

Conversation

Dhaulagiri
Copy link
Contributor

This PR cherry picks the fix from #12184 into the 1.13 branch. Not sure if anything can/should be done about the names of the commits that were cherry picked since they don't really fit the naming convention for this branch...

fpauser and others added 2 commits January 8, 2016 08:09
When a component is created we pass all `attrs` as root properties. In
this case, that means that the `classNames` concatenated properties have
already been merged/handled.

The fix is to remove the processing of `attrs.classNames` from
`normalizeClass`, which prevents any classes provided via `classNames`
from being added twice.
@rwjblue
Copy link
Member

rwjblue commented Jan 8, 2016

Restarted Sauce Labs job. I'm 👍 on merging once green...

stefanpenner added a commit that referenced this pull request Jan 8, 2016
[BUGFIX release-1-13] Prevent `classNames` from being duplicated.
@stefanpenner stefanpenner merged commit 8cc0fca into emberjs:release-1-13 Jan 8, 2016
@Dhaulagiri Dhaulagiri deleted the br-class-names branch January 8, 2016 19:45
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.

4 participants