Revert "Revert "Prep final clean"" #35222
Merged
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
davidsbailey
approved these changes
Jun 9, 2020
Comment on lines
+1
to
+3
| - if @level.supports_markdown? | ||
| - content_for(:head) do | ||
| %script{src: webpack_asset_path('js/levels/editors/_dsl.js')} |
There was a problem hiding this comment.
this is fine to get unblocked, but, ideally we want to keep these kind of conditional partials simple, with a haml file unconditionally including the corresponding js file when possible. in this particular case, the js file could simply recover gracefully if the DOM element it is looking for doesn't load.
There was a problem hiding this comment.
It looks like the only DSL defined level that does not have supports_markdown? is LevelGroup. I could just pull out Level Group as its own partial to solve this. I won't do it here but if you think thats the right move I can do it in a follow up
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.
Re-implements #35177
Forgot to rebase and get tests to run before merging. The DTT failed with:
https://codedotorg.slack.com/files/UABGK3UCB/F0150KMESLD/screen_shot_2020-06-08_at_4.47.49_pm.png?origin_team=T039SAH7W&origin_channel=DERLX5EMN
I moved the script call back into the dsl.html.haml file and recomplied javascript to check that it was working.