Commit 06871d9e by Braden MacDonald

Minor fixes

parent de47111b
...@@ -198,7 +198,7 @@ function DragAndDropTemplates(configuration) { ...@@ -198,7 +198,7 @@ function DragAndDropTemplates(configuration) {
var item_wrapper = 'div.item-wrapper'; var item_wrapper = 'div.item-wrapper';
var is_item_in_zone = function(i) { return i.is_placed && (i.zone === zone.uid); }; var is_item_in_zone = function(i) { return i.is_placed && (i.zone === zone.uid); };
var items_in_zone = $.grep(ctx.items, is_item_in_zone); var items_in_zone = $.grep(ctx.items, is_item_in_zone);
var zone_description_id = 'zone-' + zone.id + '-description'; var zone_description_id = 'zone-' + zone.uid + '-description';
if (items_in_zone.length == 0) { if (items_in_zone.length == 0) {
var zone_description = h( var zone_description = h(
'div', 'div',
...@@ -229,7 +229,6 @@ function DragAndDropTemplates(configuration) { ...@@ -229,7 +229,6 @@ function DragAndDropTemplates(configuration) {
'dropzone': 'move', 'dropzone': 'move',
'aria-dropeffect': 'move', 'aria-dropeffect': 'move',
'data-uid': zone.uid, 'data-uid': zone.uid,
'data-zone_id': zone.id,
'data-zone_align': zone.align, 'data-zone_align': zone.align,
'role': 'button', 'role': 'button',
'aria-describedby': zone_description_id, 'aria-describedby': zone_description_id,
...@@ -769,7 +768,6 @@ function DragAndDropBlock(runtime, element, configuration) { ...@@ -769,7 +768,6 @@ function DragAndDropBlock(runtime, element, configuration) {
$anchor = $zone; $anchor = $zone;
} }
var zone = String($zone.data('uid')); var zone = String($zone.data('uid'));
var zone_id = $zone.data('zone_id');
var zone_align = $zone.data('zone_align'); var zone_align = $zone.data('zone_align');
var $target_img = $root.find('.target-img'); var $target_img = $root.find('.target-img');
......
...@@ -22,9 +22,10 @@ from drag_and_drop_v2.default_data import ( ...@@ -22,9 +22,10 @@ from drag_and_drop_v2.default_data import (
) )
from drag_and_drop_v2.utils import FeedbackMessages from drag_and_drop_v2.utils import FeedbackMessages
from .test_base import BaseIntegrationTest from .test_base import BaseIntegrationTest
import time
# Globals ########################################################### # Globals ###########################################################
loader = ResourceLoader(__name__) loader = ResourceLoader(__name__)
# Classes ########################################################### # Classes ###########################################################
...@@ -68,7 +69,6 @@ class InteractionTestBase(object): ...@@ -68,7 +69,6 @@ class InteractionTestBase(object):
scenario_xml = self._get_scenario_xml() scenario_xml = self._get_scenario_xml()
self._add_scenario(self.PAGE_ID, self.PAGE_TITLE, scenario_xml) self._add_scenario(self.PAGE_ID, self.PAGE_TITLE, scenario_xml)
time.sleep(2)
self._page = self.go_to_page(self.PAGE_TITLE) self._page = self.go_to_page(self.PAGE_TITLE)
# Resize window so that the entire drag container is visible. # Resize window so that the entire drag container is visible.
# Selenium has issues when dragging to an area that is off screen. # Selenium has issues when dragging to an area that is off screen.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment