ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix RCE high-risk flag removing HTML Editor option in places 

The RCE high-risk flag was found to remove the HTML Editor option
where students use an RCE to submit text for assignments & quizzes

fixes CNVS-30554

test plan:
 - Turn on the three RCE feature flags
 - Take a quiz that has an Essay Question
 - The HTML Edit option should be above the RCE
 - Submit an assignment whose submission type is "Text Entry"
 - The HTML Edit option should be above the RCE

Change-Id: I9105e904fa2ea8728a0d92eead2f704f4c59cffa
Reviewed-on: https://gerrit.instructure.com/85997
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Benjamin Christian Nelson <bcnelson@instructure.com>
Product-Review: Jason Steck <jsteck@instructure.com>
This commit is contained in:
Jason Steck 2016-07-22 15:04:16 -06:00
parent 114fa41175
commit b4c4ef93d1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/javascripts/submit_assignment.js
View File

@ -231,7 +231,7 @@ define([
if (ui.newTab.find('a').hasClass('submit_online_text_entry_option')) {
$el = $("#submit_online_text_entry_form textarea:first");
if (!RichContentEditor.callOnRCE($el, 'exists?')) {
RichContentEditor.loadNewEditor($el);
RichContentEditor.loadNewEditor($el, {manageParent: true});
}
}
@ -243,7 +243,7 @@ define([
if (ui.tab.find('a').hasClass('submit_online_text_entry_option')) {
$el = $("#submit_online_text_entry_form textarea:first");
if (!RichContentEditor.callOnRCE($el, 'exists?')) {
RichContentEditor.loadNewEditor($el);
RichContentEditor.loadNewEditor($el, {manageParent: true});
}
}

2
public/javascripts/take_quiz.js
View File

@ -686,7 +686,7 @@ define([
setTimeout(function() {
$(".question_holder textarea.question_input").each(function() {
$(this).attr('id', 'question_input_' + quizSubmission.contentBoxCounter++);
RichContentEditor.loadNewEditor($(this));
RichContentEditor.loadNewEditor($(this), {manageParent: true});
});
}, 2000);