diff --git a/common/static/js/capa/drag_and_drop/base_image.js b/common/static/js/capa/drag_and_drop/base_image.js index 88dfea69c9..8681003347 100644 --- a/common/static/js/capa/drag_and_drop/base_image.js +++ b/common/static/js/capa/drag_and_drop/base_image.js @@ -17,7 +17,9 @@ define([], function () { '>' ); - state.baseImageEl = $('drop target image'); + state.baseImageEl = $('', { + alt: gettext("Drop target image") + }); state.baseImageEl.attr('src', state.config.baseImage); state.baseImageEl.load(function () { diff --git a/common/static/js/capa/drag_and_drop/draggable_events.js b/common/static/js/capa/drag_and_drop/draggable_events.js index ca7cc1b23e..03553c27a8 100644 --- a/common/static/js/capa/drag_and_drop/draggable_events.js +++ b/common/static/js/capa/drag_and_drop/draggable_events.js @@ -63,7 +63,6 @@ return { }); this.iconEl.appendTo(this.state.baseImageEl.parent()); - if (this.labelEl !== null) { if (this.isOriginal === true) { this.labelEl.detach(); @@ -83,9 +82,10 @@ return { if (this.isOriginal === true) { this.state.numDraggablesInSlider -= 1; } - SR.readText(gettext('dragging out of slider')); + // SR: global "screen reader" object in accessibility_tools.js + window.SR.readText(gettext('dragging out of slider')); } else { - SR.readText(gettext('dragging')); + window.SR.readText(gettext('dragging')); } this.zIndex = 1000; @@ -107,9 +107,9 @@ return { this.checkLandingElement(); if (this.inContainer === true) { - SR.readText(gettext('dropped in slider')); + window.SR.readText(gettext('dropped in slider')); } else { - SR.readText(gettext('dropped on target')); + window.SR.readText(gettext('dropped on target')); } this.toggleTargets(false); } diff --git a/common/static/js/capa/drag_and_drop/draggable_logic.js b/common/static/js/capa/drag_and_drop/draggable_logic.js index f746e6aad0..e7db461a37 100644 --- a/common/static/js/capa/drag_and_drop/draggable_logic.js +++ b/common/static/js/capa/drag_and_drop/draggable_logic.js @@ -236,15 +236,13 @@ return { return false; }, - 'toggleTargets': function (onoff) { - var c1, target, effect; - effect = (onoff ? 'move' : undefined); + 'toggleTargets': function (isEnabled) { + var effect = (isEnabled ? 'move' : undefined); this.state.baseImageEl.attr('aria-dropeffect', effect); - for (c1 = 0; c1 < this.state.targets.length; c1 += 1) { - target = this.state.targets[c1]; + $.each(this.state.targets, function (target) { target.targetEl.attr('aria-dropeffect', effect); - } + }); }, 'snapToTarget': function (target) {