-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Annotation Tools: Load Tinymce in student_view #3907
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
Annotation Tools: Load Tinymce in student_view #3907
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't you still need to set the baseURL?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seemed to still work without it on my version. If I'm not mistaken this gets initialized originally and Daniel had added that change before to use our version of tinymce instead of Edx's. Now that only one is loaded I figured that wasn't needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just tested it again and that line doesn't seem to be necessary now that there's only one TinyMCE to worry about.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh. Well, I think you probably could have worked around the issue by just removing that line, then. Nonetheless, I think this code ends up better, so I'm happy to have the rest of the pr.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, haha. Well that's good to know at least. I just fixed the tests below so I guess once the tests pass it will get merged?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Context is usually a dictionary, rather than a list.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry about that? I thought I tried {} and it had failed but I must have looked at the wrong thing? I just made a fix and squashed it with the test fixes for just this one line.
|
👍 with nitpicks. |
Fixed typo from autocomplete Fixed dict for tests
|
@cpennington Is that a spurious failure or did I screw something up? |
|
@lduarte1991 Seems like a spurious failure to me. I'll re-run the tests. |
|
@singingwolfboy Cool. looks good to go! |
Annotation Tools: Load Tinymce in student_view
Annotation Tools: Fixing tests for student_view Fixed typo from autocomplete Fixed dict for tests
Annotation Tools: Load Tinymce in student_view Annotation Tools: Fixing tests for student_view Fixed typo from autocomplete Fixed dict for tests
Background: This is a follow-up to PR #3831. According to @cpennington and @singingwolfboy there was a race condition with TinyMCE in the annotation tools which could be fixed by loading them via student_view from the XBlock API.
*Goal of PR: * This PR focuses solely on that fix. It includes both changes to the modules in xmodule as well as to the test files to verify the fix.
CMS Updates: None.
LMS Updates: Changes to the way TinyMCE loads.
Testing Notes: Everything seems to be working in the local environment but the issue always seems to be on staging.