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

Load xblock resources into studio *before* the corresponding xblock html

Browse Source
This commit is contained in:
Calen Pennington
2018-06-08 15:48:35 -04:00
parent 8b35756699
commit 5a5b73dcfa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cms/static/js/views/xblock.js
View File

@@ -125,7 +125,8 @@ define(['jquery', 'underscore', 'common/js/components/utils/view_utils', 'js/vie
*/
renderXBlockFragment: function(fragment, element) {
var html = fragment.html,
resources = fragment.resources;
resources = fragment.resources,
blockView = this;
if (!element) {
element = this.$el;
}
@@ -135,8 +136,9 @@ define(['jquery', 'underscore', 'common/js/components/utils/view_utils', 'js/vie
// by included scripts are logged to the console but are then ignored assuming
// that at least the rendered HTML will be in place.
try {
this.updateHtml(element, html);
return this.addXBlockFragmentResources(resources);
return this.addXBlockFragmentResources(resources).done(function() {
blockView.updateHtml(element, html);
});
} catch (e) {
console.error(e, e.stack);
return $.Deferred().resolve();