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

Quick fix for #14197 (TypeError in midi-components-0.0.js) #14203

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Quick fix for #14197 (TypeError in midi-components-0.0.js) #14203

merged 1 commit into from
Jan 28, 2025
+1 −53

Conversation

git-developer
Copy link
Contributor

This PR contains a quick fix for #14197 which was introduced by #12779.

@git-developer git-developer changed the base branch from main to 2.5 January 20, 2025 05:39
@git-developer git-developer mentioned this pull request Jan 20, 2025
Closed
@git-developer git-developer marked this pull request as ready for review January 24, 2025 16:45
@Swiftb0y
Copy link
Member

Thanks. Lets squash.

@christophehenry
Copy link
Contributor

christophehenry commented Jan 24, 2025 •
edited
Loading

We can undeprecate applyLayer and remove setLayer I guess.

@Swiftb0y
Copy link
Member

Swiftb0y commented Jan 25, 2025 •
edited
Loading

Sure. You wanna take care of that @git-developer?

git-developer added a commit to git-developer/mixxx that referenced this pull request Jan 25, 2025
@git-developer
refactor(midi-components): remove setLayer()
58700c8 
References mixxxdj#14203
@git-developer git-developer mentioned this pull request Jan 25, 2025
Closed
@git-developer
Copy link
Contributor Author

No problem, PR is pending.

@git-developer
Copy link
Contributor Author

I closed the PR that removes setLayer() in favor of #14232, which additionally removes the now obsolete deepMerge() function and contains some more updates in the Behringer scripts to ES6.

This was referenced Jan 28, 2025
Merged
Merged
@git-developer
Copy link
Contributor Author

I restructured the PRs to keep things sorted:

@christophehenry
Copy link
Contributor

LGTM

Swiftb0y
Swiftb0y approved these changes Jan 28, 2025
View reviewed changes
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you.

@Swiftb0y Swiftb0y merged commit 44e6b7e into mixxxdj:2.5 Jan 28, 2025
13 checks passed
@git-developer git-developer mentioned this pull request Jan 28, 2025
Closed
@git-developer git-developer deleted the fix/issue-14197 branch January 30, 2025 05:47
@git-developer git-developer mentioned this pull request Feb 2, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christophehenry christophehenry christophehenry approved these changes

@Swiftb0y Swiftb0y Swiftb0y approved these changes

Assignees
No one assigned
Labels
build controller mappings packaging preferences ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@git-developer @Swiftb0y @christophehenry