diff --git a/common/static/js/capa/drag_and_drop/draggables.js b/common/static/js/capa/drag_and_drop/draggables.js
index a813f52b4d..b764ccfaa6 100644
--- a/common/static/js/capa/drag_and_drop/draggables.js
+++ b/common/static/js/capa/drag_and_drop/draggables.js
@@ -1,5 +1,7 @@
(function(requirejs, require, define) {
- define(['js/capa/drag_and_drop/draggable_events', 'js/capa/drag_and_drop/draggable_logic'], function(draggableEvents, draggableLogic) {
+ define(['js/capa/drag_and_drop/draggable_events', 'js/capa/drag_and_drop/draggable_logic',
+ 'edx-ui-toolkit/js/utils/html-utils'],
+ function(draggableEvents, draggableLogic, HtmlUtils) {
return {
init: init
};
@@ -55,17 +57,13 @@
draggableObj.iconImgEl.appendTo(draggableObj.iconEl);
if (draggableObj.originalConfigObj.label.length > 0) {
- draggableObj.labelEl = $(
- '
' +
- draggableObj.originalConfigObj.label +
- '
'
- );
+ draggableObj.labelEl = $(HtmlUtils.joinHtml(
+ HtmlUtils.HTML(
+ ''
+ ),
+ draggableObj.originalConfigObj.label,
+ HtmlUtils.HTML('
')
+ ).toString());
draggableObj.labelEl.css({
left: 50 - draggableObj.labelWidth * 0.5,
top: 5 + draggableObj.iconHeightSmall + 5
@@ -86,17 +84,11 @@
return;
} else {
if (draggableObj.originalConfigObj.label.length > 0) {
- draggableObj.iconEl = $(
- '' +
- draggableObj.originalConfigObj.label +
- '
'
- );
+ draggableObj.iconEl = $(HtmlUtils.joinHtml(
+ HtmlUtils.HTML(''),
+ draggableObj.originalConfigObj.label,
+ HtmlUtils.HTML('
')
+ ).toString());
draggableObj.iconEl.css({
left: 50 - draggableObj.iconWidthSmall * 0.5,
top: 50 - draggableObj.iconHeightSmall * 0.5
@@ -168,21 +160,11 @@
numDraggablesOnMe: 0
};
- draggableObj.containerEl = $(
- ''
- );
+ draggableObj.containerEl = $(HtmlUtils.joinHtml(
+ HtmlUtils.HTML('')
+ ).toString());
draggableObj.containerEl.appendTo(state.sliderEl);
@@ -230,18 +212,13 @@
draggableObj.iconEl.appendTo(draggableObj.containerEl);
if (obj.label.length > 0) {
- draggableObj.labelEl = $(
- '' +
- obj.label +
- '
'
- );
+ draggableObj.labelEl = $(HtmlUtils.joinHtml(
+ HtmlUtils.HTML(
+ ''
+ ),
+ obj.label,
+ HtmlUtils.HTML('
')
+ ).toString());
draggableObj.labelEl.appendTo(draggableObj.containerEl);
draggableObj.labelWidth = draggableObj.labelEl.width();
@@ -270,19 +247,14 @@
draggableObj.iconElBorder = '1px solid black';
draggableObj.iconElLeftOffset = 9;
- draggableObj.iconEl = $(
- '' +
- obj.label +
- '
'
- );
+ draggableObj.iconEl = $(HtmlUtils.joinHtml(
+ HtmlUtils.HTML(
+ ''),
+ obj.label,
+ HtmlUtils.HTML('
')
+ ).toString());
draggableObj.iconEl.appendTo(draggableObj.containerEl);