Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16458 from edx/ammar/fix-capa-hint-focus

Browse Source 
fix capa hint focus
This commit is contained in:
Muhammad Ammar
2017-11-08 08:11:46 +05:00
committed by GitHub
parent 5b415b5c7c 690542c998
commit 4813929f1d
4 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/lib/xmodule/xmodule/capa_base.py
View File

@@ -641,12 +641,15 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
# Translators: {previous_hints} is the HTML of hints that have already been generated, {hint_number_prefix}
# is a header for this hint, and {hint_text} is the text of the hint itself.
# This string is being passed to translation only for possible reordering of the placeholders.
total_text = HTML(_('{previous_hints}<li><strong>{hint_number_prefix}</strong>{hint_text}</li>')).format(
total_text = HTML(_('{previous_hints}{list_start_tag}{strong_text}{hint_text}</li>')).format(
previous_hints=HTML(total_text),
# Translators: e.g. "Hint 1 of 3: " meaning we are showing the first of three hints.
# This text is shown in bold before the accompanying hint text.
hint_number_prefix=Text(_("Hint ({hint_num} of {hints_count}): ")).format(
hint_num=counter + 1, hints_count=len(demand_hints)
list_start_tag=HTML('<li class="hint-index-{counter}" tabindex="-1">').format(counter=counter),
strong_text=HTML('<strong>{hint_number_prefix}</strong>').format(
# Translators: e.g. "Hint 1 of 3: " meaning we are showing the first of three hints.
# This text is shown in bold before the accompanying hint text.
hint_number_prefix=Text(_("Hint ({hint_num} of {hints_count}): ")).format(
hint_num=counter + 1, hints_count=len(demand_hints)
)
),
# Course-authored HTML demand hints are supported.
hint_text=HTML(get_inner_html_from_xpath(demand_hints[counter]))

6
common/lib/xmodule/xmodule/js/src/capa/display.js
View File

@@ -486,8 +486,8 @@
this.focus_on_notification('submit');
};
Problem.prototype.focus_on_hint_notification = function() {
this.focus_on_notification('hint');
Problem.prototype.focus_on_hint_notification = function(hintIndex) {
this.$('.notification-hint .notification-message > ol > li.hint-index-' + hintIndex).focus();
};
Problem.prototype.focus_on_save_notification = function() {
@@ -1312,7 +1312,7 @@
that.hintButton.attr({disabled: 'disabled'});
}
that.el.find('.notification-hint').show();
that.focus_on_hint_notification();
that.focus_on_hint_notification(nextIndex);
} else {
that.gentle_alert(response.msg);
}