From 0c3468a067c327f9677ba55afa5725b90822ed54 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Wed, 1 Jun 2016 16:21:02 -0400 Subject: [PATCH 1/2] Use edx.HtmlUtils properly in incourse_reverify_view --- .../views/incourse_reverify_view.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lms/static/js/verify_student/views/incourse_reverify_view.js b/lms/static/js/verify_student/views/incourse_reverify_view.js index ed57e692aa..1587f44aef 100644 --- a/lms/static/js/verify_student/views/incourse_reverify_view.js +++ b/lms/static/js/verify_student/views/incourse_reverify_view.js @@ -6,7 +6,7 @@ */ var edx = edx || {}; - (function( $, _, _s, Backbone, gettext ) { + (function( $, _, _s, Backbone, gettext, HtmlUtils ) { 'use strict'; edx.verify_student = edx.verify_student || {}; @@ -40,13 +40,15 @@ }, render: function() { - var renderedTemplate = _.template($( this.templateId ).html())( - { - courseKey: this.courseKey, - platformName: this.platformName - } + HtmlUtils.setHtml( + this.el, + HtmlUtils.template($( this.templateId ).html())( + { + courseKey: this.courseKey, + platformName: this.platformName + } + ) ); - $( this.el ).html( renderedTemplate ); // Render the webcam view *after* the parent view // so that the container div for the webcam @@ -100,4 +102,4 @@ .attr('aria-disabled', !isEnabled); } }); -})(jQuery, _, _.str, Backbone, gettext); +})(jQuery, _, _.str, Backbone, gettext, edx.HtmlUtils); From 50d314d9a245396ae20c59aff51ed317507f1d75 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Tue, 7 Jun 2016 13:14:28 -0400 Subject: [PATCH 2/2] Add Backbone global to jshintrc Underscore was previously defined, it seemed odd to not have Backbone as well. --- .jshintrc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.jshintrc b/.jshintrc index 42c7dbc103..85f5d2013a 100644 --- a/.jshintrc +++ b/.jshintrc @@ -109,10 +109,10 @@ // The parameter "predef" should remain empty for this configuration file // to remain as general as possible. "predef": [ - // jQuery globals - "jQuery", "$", - - // Underscore.js globals + // JavaScript global libraries + "Backbone", + "jQuery", + "$", "_", // RequireJS globals