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

Revert "Switch container factory to webpack"

Browse Source
This commit is contained in:
Calen Pennington
2018-06-07 13:46:47 -04:00
committed by GitHub
parent 6d8aebe05b
commit 18d93b00ba
158 changed files with 6787 additions and 7350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cms/templates/studio_xblock_wrapper.html
View File

@@ -7,7 +7,6 @@ from lms.lib.utils import is_unit
from openedx.core.djangolib.js_utils import (
dump_js_escaped_json, js_escaped_string
)
from xmodule.x_module import XModule, XModuleDescriptor
%>
<%
xblock_url = xblock_studio_url(xblock)
@@ -27,19 +26,17 @@ block_is_unit = is_unit(xblock)
</script>
</%block>
<%static:webpack entry="js/factories/xblock_validation">
XBlockValidationFactory(
${messages | n, dump_js_escaped_json},
${bool(xblock_url) | n, dump_js_escaped_json}, // xblock_url will be None or a string
${bool(is_root) | n, dump_js_escaped_json}, // is_root will be None or a boolean
${bool(block_is_unit) | n, dump_js_escaped_json}, // block_is_unit will be None or a boolean
$('div.xblock-validation-messages[data-locator="${xblock.location | n, js_escaped_string}"]')
);
</%static:webpack>
% if isinstance(xblock, (XModule, XModuleDescriptor)):
<%static:webpack entry="${getattr(xblock.__class__, 'unmixed_class', xblock.__class__).__name__}"/>
% endif
<script>
require(["jquery", "js/factories/xblock_validation"], function($, XBlockValidationFactory) {
XBlockValidationFactory(
${messages | n, dump_js_escaped_json},
${bool(xblock_url) | n, dump_js_escaped_json}, // xblock_url will be None or a string
${bool(is_root) | n, dump_js_escaped_json}, // is_root will be None or a boolean
${bool(block_is_unit) | n, dump_js_escaped_json}, // block_is_unit will be None or a boolean
$('div.xblock-validation-messages[data-locator="${xblock.location | n, js_escaped_string}"]')
);
});
</script>
% if not is_root:
% if is_reorderable: