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

Revert "Pass DOM element, not jQuery object to XBlock initialisation." #11674

Merged
merged 1 commit into from
Feb 26, 2016

Conversation

bradenmacdonald
Copy link
Contributor

Reverts edx/edx-platform#11433 because the one-line change to common/static/js/xblock/core.js has broken the Problem Builder XBlock in LMS and Studio. (It's now passing a jQuery element from the runtime.children() JS call, which is inconsistent with the other fixes in that PR). Since this has broken an XBlock used in courses, I am proposing this revert as a quick fix, and will follow up with a re-implemented version of #11433.

JIRA: https://openedx.atlassian.net/browse/TNL-4161

Verification:

  • Braden tested locally to confirm this fixes Problem Builder and doesn't break Drag and Drop v2

@andy-armstrong
Copy link
Contributor

👍 makes sense to revert this until you're ready with the better fix. Sorry I missed this issue in the review, and of course there are no tests for the problem builder block to catch it.

@bradenmacdonald
Copy link
Contributor Author

jenkins run lettuce

@smarnach
Copy link
Contributor

👍 I tested locally on my devstack with the Problem Builder version currently used by edx-platform, and everything works fine.

bradenmacdonald added a commit that referenced this pull request Feb 26, 2016
…block

Revert "Pass DOM element, not jQuery object to XBlock initialisation."
@bradenmacdonald bradenmacdonald merged commit daadc1e into master Feb 26, 2016
@bradenmacdonald bradenmacdonald deleted the revert-11433-smarnach/studio-add-xblock branch August 1, 2016 22:28
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.

3 participants