From 0b7ed973e7081bc1df1fa06e31761098671dec43 Mon Sep 17 00:00:00 2001 From: azanbinzahid Date: Wed, 2 Dec 2020 14:51:55 +0500 Subject: [PATCH 01/11] PROD-2162 --- lms/static/js/verify_student/views/image_input_view.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lms/static/js/verify_student/views/image_input_view.js b/lms/static/js/verify_student/views/image_input_view.js index c25dafe429..a7e6afcffc 100644 --- a/lms/static/js/verify_student/views/image_input_view.js +++ b/lms/static/js/verify_student/views/image_input_view.js @@ -24,9 +24,11 @@ }, render: function() { - var renderedHtml = _.template($(this.template).html())({}); - $(this.el).html(renderedHtml); - + var renderedHtml = edx.HtmlUtils.template($(this.template).html())({}); + edx.HtmlUtils.setHtml( + $(this.el), + renderedHtml + ); // Set the submit button to disabled by default this.setSubmitButtonEnabled(false); From cd06c74d2c89a23085c34a4a25ae0290577fbfa7 Mon Sep 17 00:00:00 2001 From: azanbinzahid Date: Wed, 2 Dec 2020 21:19:11 +0500 Subject: [PATCH 02/11] PROD-2181 --- lms/static/js/components/card/views/card.js | 31 ++++++++++++--------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/lms/static/js/components/card/views/card.js b/lms/static/js/components/card/views/card.js index 3fd0fb3220..ffff79586d 100644 --- a/lms/static/js/components/card/views/card.js +++ b/lms/static/js/components/card/views/card.js @@ -20,8 +20,10 @@ define(['jquery', 'underscore', 'backbone', - 'text!templates/components/card/card.underscore'], - function($, _, Backbone, cardTemplate) { + 'text!templates/components/card/card.underscore', + 'edx-ui-toolkit/js/utils/html-utils' + ], + function($, _, Backbone, cardTemplate, HtmlUtils) { var CardView = Backbone.View.extend({ tagName: 'li', @@ -46,7 +48,7 @@ this.render(); }, - template: _.template(cardTemplate), + template: HtmlUtils.template(cardTemplate), switchOnConfiguration: function(square_result, list_result) { return this.callIfFunction(this.configuration) === 'square_card' ? @@ -77,16 +79,19 @@ if (description.length > maxLength) { description = description.substring(0, maxLength).trim() + '...'; } - this.$el.html(this.template({ - pennant: this.callIfFunction(this.pennant), - title: this.callIfFunction(this.title), - description: description, - action_class: this.callIfFunction(this.actionClass), - action_url: this.callIfFunction(this.actionUrl), - action_content: this.callIfFunction(this.actionContent), - configuration: this.callIfFunction(this.configuration), - srInfo: this.srInfo - })); + HtmlUtils.setHtml( + this.$el, + this.template({ + pennant: this.callIfFunction(this.pennant), + title: this.callIfFunction(this.title), + description: description, + action_class: this.callIfFunction(this.actionClass), + action_url: this.callIfFunction(this.actionUrl), + action_content: this.callIfFunction(this.actionContent), + configuration: this.callIfFunction(this.configuration), + srInfo: this.srInfo + }) + ); var detailsEl = this.$el.find('.card-meta'); _.each(this.callIfFunction(this.details), function(detail) { // Call setElement to rebind event handlers From fe72df1e5efc16cd354d3995e085fd8b3d838281 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 3 Dec 2020 14:01:11 +0500 Subject: [PATCH 03/11] PROD-2213 --- lms/static/js/instructor_dashboard/ecommerce.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/static/js/instructor_dashboard/ecommerce.js b/lms/static/js/instructor_dashboard/ecommerce.js index 8e8f7b32a0..a60ec08c12 100644 --- a/lms/static/js/instructor_dashboard/ecommerce.js +++ b/lms/static/js/instructor_dashboard/ecommerce.js @@ -157,7 +157,7 @@ var edx = edx || {}; // remove the first element after the registration_code_status_form // so it doesn't duplicate the registration_code_lookup_actions in the UI. $registration_code_status_form.next().remove(); - $(registration_code_lookup_actions).insertAfter($registration_code_status_form); + edx.HtmlUtils.append($registration_code_status_form, $(registration_code_lookup_actions)); } }, error: function(jqXHR, textStatus, errorThrown) { From 465b194e6a68ac413d363faa4c2a11d1f9f2a0e5 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 3 Dec 2020 15:10:01 +0500 Subject: [PATCH 04/11] PROD-2217 --- .../components/system-feedback.underscore | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/common/static/common/templates/components/system-feedback.underscore b/common/static/common/templates/components/system-feedback.underscore index 9168abc9d5..fb8b32af22 100644 --- a/common/static/common/templates/components/system-feedback.underscore +++ b/common/static/common/templates/components/system-feedback.underscore @@ -1,22 +1,22 @@ -
wrapper-<%- type %>-<%- intent %> <% if(obj.shown) { %>is-shown<% } else { %>is-hiding<% } %> - <% if(_.contains(['help', 'mini'], intent)) { %>wrapper-<%= type %>-status<% } %>" - id="<%= type %>-<%= intent %>" + <% if(_.contains(['help', 'mini'], intent)) { %>wrapper-<%- type %>-status<% } %>" + id="<%- type %>-<%- intent %>" aria-hidden="<% if(obj.shown) { %>false<% } else { %>true<% } %>" - aria-labelledby="<%= type %>-<%= intent %>-title" + aria-labelledby="<%- type %>-<%- intent %>-title" tabindex="-1" - <% if (obj.message) { %>aria-describedby="<%= type %>-<%= intent %>-description" <% } %> + <% if (obj.message) { %>aria-describedby="<%- type %>-<%- intent %>-description" <% } %> <% if (obj.actions) { %>role="dialog"<% } %> > -
+
<% if(obj.icon) { %> <% var iconClass = {"warning": "warning", "confirmation": "check", "error": "warning", "announcement": "bullhorn", "step-required": "exclamation-circle", "help": "question", "mini": "cog"} %> - + <% } %>
-

<%- title %>

- <% if(obj.message) { %>

<%- message %>

<% } %> +

<%- title %>

+ <% if(obj.message) { %>

<%- message %>

<% } %>
<% if(obj.actions) { %> @@ -24,13 +24,13 @@
    <% if(actions.primary) { %>
  • - +
    • <% } %> <% if(actions.secondary) { _.each(actions.secondary, function(secondary) { %>
  • - +
    • <% }); } %> @@ -39,9 +39,9 @@ <% } %> <% if(obj.closeIcon) { %> - + - close <%= type %> + close <%- type %> <% } %>
From a63848bfd537a842ffeb4a5deea75dabc2e932c0 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 3 Dec 2020 15:54:04 +0500 Subject: [PATCH 05/11] PROD-2219 --- .../js/capa/drag_and_drop/draggables.js | 98 +++++++------------ 1 file changed, 35 insertions(+), 63 deletions(-) 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); From 6104eda482e33d838c4878750954f007f264a9a9 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Thu, 3 Dec 2020 15:54:23 +0500 Subject: [PATCH 06/11] PROD-2252 --- .../test_site/templates/static_templates/faq.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/test/test_sites/test_site/templates/static_templates/faq.html b/common/test/test_sites/test_site/templates/static_templates/faq.html index 8723f73871..df6be237c6 100644 --- a/common/test/test_sites/test_site/templates/static_templates/faq.html +++ b/common/test/test_sites/test_site/templates/static_templates/faq.html @@ -4,6 +4,8 @@ <%! from django.utils.translation import ugettext as _ from django.urls import reverse + +from openedx.core.djangolib.markup import HTML, Text %> <%block name="title">${_("FAQ")} @@ -23,7 +25,7 @@ from django.urls import reverse

${_("Organization")}

${_("What is {edX}?").format(edX="edX")}

-

${_('{EdX} is a not-for-profit enterprise of its founding partners, the {MIT_long} ({MIT}) and {harvard_u} that offers online learning to on-campus students and to millions of people around the world. To do so, {edX} is building an open-source online learning platform and hosts an online web portal at www.edx.org for online education.').format(EdX="EdX", edX="edX", MIT_long="Massachusetts Institute of Technology", MIT="MIT", harvard_u="Harvard University")}

+

${Text(_('{EdX} is a not-for-profit enterprise of its founding partners, the {MIT_long} ({MIT}) and {harvard_u} that offers online learning to on-campus students and to millions of people around the world. To do so, {edX} is building an open-source online learning platform and hosts an online web portal at {link_start}www.edx.org{link_end} for online education.')).format(EdX="EdX", edX="edX", MIT_long="Massachusetts Institute of Technology", MIT="MIT", harvard_u="Harvard University", link_start=HTML(''), link_end=HTML(''))}

${_("{EdX} currently offers {HarvardX}, {MITx} and {BerkeleyX} classes online for free. Beginning in fall 2013, {edX} will offer {WellesleyX} , {GeorgetownX} and the {UTexas} classes online for free. The {UT} System includes nine universities and six health institutions. In 2014, {edX} will further expand its consortium, including several international schools, when it begins offering courses from {EPFL}, {McGill}, {Toronto}, {ANU}, {Delft}, and {Rice}. The {edX} institutions aim to extend their collective reach to build a global community of online students. Along with offering online courses, the three universities undertake research on how students learn and how technology can transform learning both on-campus and online throughout the world.").format( EdX="EdX", edX="edX", @@ -89,7 +91,7 @@ from django.urls import reverse

${_("What will the scope of the online courses be? How many? Which faculty?")}

-

${_('Our goal is to offer a wide variety of courses across disciplines. There are currently {link_start}fifteen{link_end} offered on the {edX} platform.').format(link_start='', link_end='', edX="edX")}

+

${Text(_('Our goal is to offer a wide variety of courses across disciplines. There are currently {link_start}fifteen{link_end} offered on the {edX} platform.')).format(link_start=HTML(''), link_end=HTML(''), edX="edX")}

${_("Who is the learner? Domestic or international? Age range?")}

@@ -105,11 +107,11 @@ from django.urls import reverse

${_("How may I apply to study with {edX}?").format(edX="edX")}

-

${_('Simply complete the online {link_start}signup form{link_end}. Enrolling will create your unique student record in the {edX} database, allow you to register for classes, and to receive a certificate on successful completion.').format(link_start='', link_end='', edX="edX")}

+

${Text(_('Simply complete the online {link_start}signup form{link_end}. Enrolling will create your unique student record in the {edX} database, allow you to register for classes, and to receive a certificate on successful completion.')).format(link_start=HTML(''), link_end=HTML(''), edX="edX")}

${_("How may another university participate in {edX}? ").format(edX="edX")}

-

${_('If you are from a university interested in discussing {edX}, please email {email}').format(email='university@edx.org', edX="edX")}

+

${Text(_('If you are from a university interested in discussing {edX}, please email {email}')).format(email=HTML('university@edx.org'), edX="edX")}

@@ -118,7 +120,7 @@ from django.urls import reverse

${_("What technology will {edX} use?").format(edX="edX")}

${_("The {edX} open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.").format(edX="edX")}

-

${_("The first version of the technology was used in the first {MITx} course, 6.002x Circuits and Electronics, which launched in Spring, 2012.").format(MITx="MITx")}

+

${Text(_("The first version of the technology was used in the first {em_start}{MITx}{em_end} course, 6.002x Circuits and Electronics, which launched in Spring, 2012.")).format(em_start=HTML(''), MITx="MITx", em_end=HTML(''))}

${_("How is this different from what other universities are doing online?")}

From 35d658e66c49e6b35c5476d8715273021adab35a Mon Sep 17 00:00:00 2001 From: azanbinzahid Date: Fri, 4 Dec 2020 17:09:03 +0500 Subject: [PATCH 07/11] PROD-2215 --- .../common/js/components/views/tabbed_view.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/common/static/common/js/components/views/tabbed_view.js b/common/static/common/js/components/views/tabbed_view.js index f9ade4688d..9a79e7834c 100644 --- a/common/static/common/js/components/views/tabbed_view.js +++ b/common/static/common/js/components/views/tabbed_view.js @@ -8,7 +8,8 @@ 'edx-ui-toolkit/js/utils/constants', 'text!common/templates/components/tabbed_view.underscore', 'text!common/templates/components/tab.underscore', - 'text!common/templates/components/tabpanel.underscore' + 'text!common/templates/components/tabpanel.underscore', + 'edx-ui-toolkit/js/utils/html-utils' ], function( Backbone, _, @@ -16,7 +17,8 @@ Constants, tabbedViewTemplate, tabTemplate, - tabPanelTemplate + tabPanelTemplate, + HtmlUtils ) { var getTabPanelId = function(id) { return 'tabpanel-' + id; @@ -64,7 +66,7 @@ initialize: function(options) { this.router = options.router || null; this.tabs = options.tabs; - this.template = _.template(tabbedViewTemplate)({ + this.template = HtmlUtils.template(tabbedViewTemplate)({ viewLabel: this.viewLabel }); // Convert each view into a TabPanelView @@ -82,7 +84,10 @@ }, render: function() { var self = this; - this.$el.html(this.template); + HtmlUtils.setHtml( + this.$el, + this.template + ); _.each(this.tabs, function(tabInfo, index) { var $tabEl = $(_.template(tabTemplate)({ index: index, From 7c2d28530b89720a1d9b5f40d1826dfbb00baa21 Mon Sep 17 00:00:00 2001 From: azanbinzahid Date: Fri, 4 Dec 2020 17:47:17 +0500 Subject: [PATCH 08/11] PROD-2208 --- lms/static/js/discovery/views/filter_label.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lms/static/js/discovery/views/filter_label.js b/lms/static/js/discovery/views/filter_label.js index 9100eb9b6b..c594264f76 100644 --- a/lms/static/js/discovery/views/filter_label.js +++ b/lms/static/js/discovery/views/filter_label.js @@ -3,8 +3,9 @@ 'jquery', 'underscore', 'backbone', - 'gettext' - ], function($, _, Backbone, gettext) { + 'gettext', + 'edx-ui-toolkit/js/utils/html-utils' + ], function($, _, Backbone, gettext, HtmlUtils) { 'use strict'; return Backbone.View.extend({ @@ -14,7 +15,7 @@ className: 'active-filter', initialize: function() { - this.tpl = _.template($('#filter-tpl').html()); + this.tpl = HtmlUtils.template($('#filter-tpl').html()); this.listenTo(this.model, 'remove', this.remove); this.listenTo(this.model, 'change', this.render); }, @@ -23,7 +24,10 @@ var data = _.clone(this.model.attributes); data.name = data.name || data.query; this.className = data.type; - this.$el.html(this.tpl(data)); + HtmlUtils.setHtml( + this.$el, + this.tpl(data) + ); return this; } From 8159d76e8ca3cf2fe48a0bb6490095331abd1d79 Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Mon, 7 Dec 2020 14:29:03 +0500 Subject: [PATCH 09/11] PROD-2211 --- .../static/js/capa/drag_and_drop/scroller.js | 144 ++++++------------ 1 file changed, 50 insertions(+), 94 deletions(-) diff --git a/common/static/js/capa/drag_and_drop/scroller.js b/common/static/js/capa/drag_and_drop/scroller.js index 0a1fa48ea7..7a52c3c237 100644 --- a/common/static/js/capa/drag_and_drop/scroller.js +++ b/common/static/js/capa/drag_and_drop/scroller.js @@ -1,52 +1,33 @@ (function(requirejs, require, define) { - define([], function() { + define(['edx-ui-toolkit/js/utils/html-utils'], function(HtmlUtils) { return Scroller; function Scroller(state) { var $parentEl, $moveLeftEl, $showEl, $moveRightEl, showElLeftMargin; - $parentEl = $( - '
' - ); + $parentEl = $(HtmlUtils.HTML( + '
' + ).toString()); - $moveLeftEl = $( - '
' + - '
' + - '
' - ); + $moveLeftEl = $(HtmlUtils.joinHtml( + HtmlUtils.HTML('
'), + HtmlUtils.HTML('
'), + HtmlUtils.HTML('
'), + HtmlUtils.HTML('
') + ).toString()); $moveLeftEl.appendTo($parentEl); // The below is necessary to prevent the browser thinking that we want @@ -77,17 +58,9 @@ }); }); - $showEl = $( - '
' - ); + $showEl = $(HtmlUtils.HTML( + '
' + ).toString()); $showEl.appendTo($parentEl); showElLeftMargin = 0; @@ -96,53 +69,36 @@ // so that any SANE number of draggables will fit in a single row. It // will be contained in a parent element whose 'overflow' CSS value // will be hidden, preventing the long row from fully being visible. - state.sliderEl = $( - '
' - ); + // eslint-disable-next-line no-param-reassign + state.sliderEl = $(HtmlUtils.joinHtml( + HtmlUtils.HTML('
') + ).toString()); state.sliderEl.appendTo($showEl); state.sliderEl.mousedown(function(event) { event.preventDefault(); }); - $moveRightEl = $( - '
' + - '
' + - '
' - ); + $moveRightEl = $(HtmlUtils.joinHtml( + HtmlUtils.HTML('
'), + HtmlUtils.HTML('
'), + HtmlUtils.HTML('
'), + HtmlUtils.HTML('
') + ).toString()); $moveRightEl.appendTo($parentEl); // The below is necessary to prevent the browser thinking that we want From 5b44c8007e30f0d248048b3511f4a29333b09cea Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Mon, 7 Dec 2020 19:18:05 +0500 Subject: [PATCH 10/11] PROD-2209 --- .../xmodule/xmodule/js/src/poll/poll_main.js | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll_main.js b/common/lib/xmodule/xmodule/js/src/poll/poll_main.js index e97a1356f1..e823ce0a3f 100644 --- a/common/lib/xmodule/xmodule/js/src/poll/poll_main.js +++ b/common/lib/xmodule/xmodule/js/src/poll/poll_main.js @@ -1,5 +1,5 @@ (function(requirejs, require, define) { - define('PollMain', [], function() { + define('PollMain', ['edx-ui-toolkit/js/utils/html-utils'], function(HtmlUtils) { PollMain.prototype = { showAnswerGraph: function(poll_answers, total) { @@ -23,7 +23,8 @@ percentValue = (numValue / totalValue) * 100.0; _this.answersObj[index].statsEl.show(); - _this.answersObj[index].numberEl.html('' + value + ' (' + percentValue.toFixed(1) + '%)'); + // eslint-disable-next-line max-len + _this.answersObj[index].numberEl.html(HtmlUtils.HTML('' + value + ' (' + percentValue.toFixed(1) + '%)').toString()); _this.answersObj[index].percentEl.css({ width: '' + percentValue.toFixed(1) + '%' }); @@ -119,10 +120,12 @@ (this.jsonConfig.poll_answer.length > 0) && (this.jsonConfig.answers.hasOwnProperty(this.jsonConfig.poll_answer) === false) ) { - this.questionEl.append( - '

Error!

' + - '

XML data format changed. List of answers was modified, but poll data was not updated.

' - ); + HtmlUtils.append(this.questionEl, HtmlUtils.joinHtml( + HtmlUtils.HTML('

Error!

'), + HtmlUtils.HTML( + '

XML data format changed. List of answers was modified, but poll data was not updated.

' + ) + )); return; } @@ -133,8 +136,8 @@ // Get the URL to which we will post the users answer to the question. this.ajax_url = this.questionEl.data('ajax-url'); - this.questionHtmlMarkup = $('
').html(this.jsonConfig.question).text(); - this.questionEl.append(this.questionHtmlMarkup); + this.questionHtmlMarkup = $('
').html(HtmlUtils.HTML(this.jsonConfig.question).toString()).text(); + this.questionEl.append(HtmlUtils.HTML(this.questionHtmlMarkup).toString()); // When the user selects and answer, we will set this flag to true. this.questionAnswered = false; @@ -160,24 +163,24 @@ answer.questionEl = $('
'); answer.buttonEl = $('
'); answer.textEl = $('
'); - answer.questionEl.append(answer.buttonEl); - answer.questionEl.append(answer.textEl); + answer.questionEl.append(HtmlUtils.HTML(answer.buttonEl).toString()); + answer.questionEl.append(HtmlUtils.HTML(answer.textEl).toString()); - answer.el.append(answer.questionEl); + answer.el.append(HtmlUtils.HTML(answer.questionEl).toString()); answer.statsEl = $('
'); answer.barEl = $('
'); answer.percentEl = $('
'); - answer.barEl.append(answer.percentEl); + answer.barEl.append(HtmlUtils.HTML(answer.percentEl).toString()); answer.numberEl = $('
'); - answer.statsEl.append(answer.barEl); - answer.statsEl.append(answer.numberEl); + answer.statsEl.append(HtmlUtils.HTML(answer.barEl).toString()); + answer.statsEl.append(HtmlUtils.HTML(answer.numberEl).toString()); answer.statsEl.hide(); - answer.el.append(answer.statsEl); + answer.el.append(HtmlUtils.HTML(answer.statsEl).toString()); - answer.textEl.html(value); + answer.textEl.html(HtmlUtils.HTML(value).toString()); if (_this.shortVersion === true) { $.each(answer, function(index, value) { @@ -214,8 +217,7 @@ this.resetButton.hide(); } - this.resetButton.appendTo(this.questionEl); - + HtmlUtils.append(this.questionEl, this.resetButton); this.resetButton.on('click', function() { _this.submitReset(); }); @@ -298,6 +300,7 @@ _this.jsonConfig.poll_answers[index] = value; }); + // xss-lint: disable=javascript-jquery-html _this.questionEl.children('.poll_question_div').html(JSON.stringify(_this.jsonConfig)); _this.postInit(); From c754f20dacd323b84664cfe87f4d80f4a98de6ec Mon Sep 17 00:00:00 2001 From: Ali-D-Akbar Date: Tue, 8 Dec 2020 19:02:00 +0500 Subject: [PATCH 11/11] PROD-2199 --- lms/static/js/edxnotes/views/tabs/tags.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/static/js/edxnotes/views/tabs/tags.js b/lms/static/js/edxnotes/views/tabs/tags.js index 86be5f50c9..5b9eda9764 100644 --- a/lms/static/js/edxnotes/views/tabs/tags.js +++ b/lms/static/js/edxnotes/views/tabs/tags.js @@ -2,8 +2,8 @@ 'use strict'; define([ 'gettext', 'jquery', 'underscore', 'js/edxnotes/views/note_group', 'js/edxnotes/views/tab_panel', - 'js/edxnotes/views/tab_view' - ], function(gettext, $, _, NoteGroupView, TabPanelView, TabView) { + 'js/edxnotes/views/tab_view', 'edx-ui-toolkit/js/utils/html-utils' + ], function(gettext, $, _, NoteGroupView, TabPanelView, TabView, HtmlUtils) { var view = 'Tags'; var TagsView = TabView.extend({ scrollToTag: function(tagName) { @@ -104,7 +104,7 @@ container.appendChild(group.render().el); }, this); - this.$el.append(container); + this.$el.append(HtmlUtils.HTML(container).toString()); return this; },