Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, March 26th
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
db2078ed
Commit
db2078ed
authored
6 years ago
by
Calen Pennington
Browse files
Options
Downloads
Patches
Plain Diff
fixup! Load all webpack chunks into fragments as correctly-typed resources
parent
9c32073e
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cms/static/js/views/xblock.js
+6
-1
6 additions, 1 deletion
cms/static/js/views/xblock.js
common/lib/xmodule/xmodule/js/src/conditional/display.js
+2
-5
2 additions, 5 deletions
common/lib/xmodule/xmodule/js/src/conditional/display.js
with
8 additions
and
6 deletions
cms/static/js/views/xblock.js
+
6
−
1
View file @
db2078ed
...
...
@@ -137,7 +137,12 @@ define(['jquery', 'underscore', 'common/js/components/utils/view_utils', 'js/vie
// that at least the rendered HTML will be in place.
try
{
return
this
.
addXBlockFragmentResources
(
resources
).
done
(
function
()
{
blockView
.
updateHtml
(
element
,
html
);
console
.
log
(
'
Updating HTML
'
);
try
{
blockView
.
updateHtml
(
element
,
html
);
}
catch
(
e
)
{
console
.
error
(
e
,
e
.
stack
);
}
});
}
catch
(
e
)
{
console
.
error
(
e
,
e
.
stack
);
...
...
This diff is collapsed.
Click to expand it.
common/lib/xmodule/xmodule/js/src/conditional/display.js
+
2
−
5
View file @
db2078ed
...
...
@@ -149,12 +149,9 @@
}
}
else
if
(
mimetype
===
'
application/javascript
'
)
{
if
(
kind
===
'
text
'
)
{
eval
.
call
(
window
,
data
);
console
.
log
(
"
JavaScript text resource eval'd
"
,
resource
);
$head
.
append
(
'
<script>
'
+
data
+
'
</script>
'
);
}
else
if
(
kind
===
'
url
'
)
{
$script
(
data
,
data
,
function
()
{
console
.
log
(
'
JavaScript url resource loaded
'
,
resource
);
});
$script
(
data
,
data
);
}
}
else
if
(
mimetype
===
'
text/html
'
)
{
if
(
placement
===
'
head
'
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment