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

Log conditional xblock fragment resource loading

Browse Source
This commit is contained in:
Calen Pennington
2018-08-29 13:46:17 -04:00
parent 39a4a396a8
commit 8878edea26
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/xmodule/xmodule/js/src/conditional/display.js
View File

@@ -26,6 +26,7 @@
fragments = response.fragments; fragments = response.fragments;
for (i = 0, len = fragments.length; i < len; i++) { for (i = 0, len = fragments.length; i < len; i++) {
renderedFragments.push(_this.renderXBlockFragment(fragments[i])); renderedFragments.push(_this.renderXBlockFragment(fragments[i]));
console.log("Started fragment loading", fragments[i])
} }
parentEl = $(element).parent(); parentEl = $(element).parent();
parentId = parentEl.attr('id'); parentId = parentEl.attr('id');
@@ -48,6 +49,7 @@
Use that token instead of @requestToken by simply not passing a token into initializeBlocks. Use that token instead of @requestToken by simply not passing a token into initializeBlocks.
*/ */
$.when.apply(null, renderedFragments).done(function() { $.when.apply(null, renderedFragments).done(function() {
console.log("All fragments loaded, initializing blocks");
XBlock.initializeBlocks(_this.el); XBlock.initializeBlocks(_this.el);
}); });
}; };
@@ -77,6 +79,7 @@
// We give XBlock fragments free-reign to add javascript and CSS to // We give XBlock fragments free-reign to add javascript and CSS to
// to the page, so XSS escaping doesn't matter much in this context // to the page, so XSS escaping doesn't matter much in this context
// xss-lint: disable=javascript-jquery-append // xss-lint: disable=javascript-jquery-append
console.log("Fragment resources loaded, appending HTML");
element.append(html); element.append(html);
}); });
} catch (e) { } catch (e) {
@@ -147,9 +150,12 @@
} else if (mimetype === 'application/javascript') { } else if (mimetype === 'application/javascript') {
if (kind === 'text') { if (kind === 'text') {
eval.call(window, data); eval.call(window, data);
console.log("JavaScript text resource eval'd", resource);
} else if (kind === 'url') { } else if (kind === 'url') {
// This is a dependency loaded from the LMS (not ideal) // This is a dependency loaded from the LMS (not ideal)
return ViewUtils.loadJavaScript(data); return ViewUtils.loadJavaScript(data).done(function() {
console.log('JavaScript url resource loaded', resource);
});
} }
} else if (mimetype === 'text/html') { } else if (mimetype === 'text/html') {
if (placement === 'head') { if (placement === 'head') {