Use (safe) markdown instead of raw text in render_multi_or_match_content #32521
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…multi_or_match_content to markdown
7 tasks
…dicated image syntax
Hamms
changed the title
convert all DSL-defined levels using HTML to instead use markdown
davidsbailey
approved these changes
Jan 14, 2020
| @@ -672,7 +673,8 @@ def render_multi_or_match_content(text) | |||
| return match_answer_as_embedded_blockly(path) if File.extname(path).ends_with? '_blocks' | |||
| return match_answer_as_iframe(path, width) if File.extname(path) == '.level' | |||
|
|
|||
| text | |||
| @markdown_renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::Inline) | |||
| @markdown_renderer.render(text).html_safe | |||
There was a problem hiding this comment.
This looks like it will create a new markdown renderer for each instance of each class which includes this module and calls this method, including once for each multi or match script level object. Perhaps it would be better to store it on @@markdown_renderer, so that it only gets instantiated once for each class which includes this module and calls this method?
| wrong "rocket-height(seconds) = seconds \* 48" |
There was a problem hiding this comment.
remove extraneous \? if it is needed, I'm curious why its not also needed on line 12.
There was a problem hiding this comment.
weird; I'm not sure why this got added, given that it is indeed not needed
…t we want to be resued between instances
This was referenced Jan 16, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
To prevent HTML injection in translations.
Also update the content of those DSL levels currently using HTML to use Markdown. Note: a couple of the updated levels do have minor visual changes. Those changes have all been approved by the relevant curriculum team member.
Uses the new inline markdown renderer added in #32573
Also see this gsheet for a breakdown of which DSL levels are using what kind of supported content (text, image, iframe, blockly, html) in the affected fields.
Links
Reviewer Checklist: