Merge pull request #12608 from edx/efischer/add_edx

Correct references to HtmlUtils in underscore files
This commit is contained in:
Eric Fischer
2016-06-07 14:48:33 -04:00
2 changed files with 14 additions and 12 deletions

View File

@@ -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

View File

@@ -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);