Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering"

Browse Source 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
This commit is contained in:
Eric Fischer
2018-06-15 13:18:27 -04:00
parent 44945dc03c
commit e72549cdbe
162 changed files with 7019 additions and 7642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/xsslint/xsslint/linters.py
View File

@@ -1366,15 +1366,17 @@ class MakoTemplateLinter(BaseLinter):
"""
contexts_re = re.compile(
r"""
<script.*?(?<!/)> | # script tag start
<script.*?> | # script tag start
</script> | # script tag end
<%static:require_module(_async)?.*?(?<!/)> | # require js script tag start (optionally the _async version)
<%static:require_module(_async)?.*?> | # require js script tag start (optionally the _async version)
</%static:require_module(_async)?> | # require js script tag end (optionally the _async version)
<%static:webpack.*(?<!/)> | # webpack script tag start
<%static:invoke_page_bundle.*?> | # require js script tag start
</%static:invoke_page_bundle> | # require js script tag end
<%static:webpack.*?> | # webpack script tag start
</%static:webpack> | # webpack script tag end
<%static:studiofrontend.*?(?<!/)> | # studiofrontend script tag start
<%static:studiofrontend.*?> | # studiofrontend script tag start
</%static:studiofrontend> | # studiofrontend script tag end
<%block[ ]*name=['"]requirejs['"]\w*(?<!/)> | # require js tag start
<%block[ ]*name=['"]requirejs['"]\w*> | # require js tag start
</%block> # require js tag end
""",
re.VERBOSE | re.IGNORECASE