From 8fd8457398122864800c959e45591d8b0c0dbcfb Mon Sep 17 00:00:00 2001 From: Pavel Handleman Date: Wed, 21 Aug 2019 17:19:39 +0300 Subject: [PATCH 1/5] TAO-8725 draggable event executed before dropzone --- .../renderers/interactions/AssociateInteraction.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js b/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js index ed9c23be..74713ea0 100644 --- a/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js +++ b/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js @@ -492,8 +492,9 @@ var render = function(interaction) { onend: function(e) { var $target = $(e.target); $target.removeClass('dragged'); - _resetSelection(); - + _.delay(function(){ + _resetSelection(); + }); interactUtils.restoreOriginalPosition($target); interactUtils.iFrameDragFixOff(); } From 68394018525652955133ad87ae2669e5096aac17 Mon Sep 17 00:00:00 2001 From: Pavel Handleman Date: Thu, 22 Aug 2019 10:31:27 +0300 Subject: [PATCH 2/5] TAO-8725 version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d1b41d35..a09b88f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-item-runner-qti", - "version": "0.4.1", + "version": "0.4.2", "displayName": "TAO Item Runner QTI", "description": "TAO QTI Item Runner modules", "files": [ From 7bc4acde2959b1988a047f9dcf8f352bd328294d Mon Sep 17 00:00:00 2001 From: Pavel Handleman Date: Thu, 22 Aug 2019 12:01:34 +0300 Subject: [PATCH 3/5] TAO-8725 delay description --- .../renderers/interactions/AssociateInteraction.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js b/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js index 74713ea0..8bd82da9 100644 --- a/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js +++ b/src/qtiCommonRenderer/renderers/interactions/AssociateInteraction.js @@ -492,6 +492,7 @@ var render = function(interaction) { onend: function(e) { var $target = $(e.target); $target.removeClass('dragged'); + // The reason of placing delay here is that there was timing conflict between "draggable" and "drag-zone" elements. _.delay(function(){ _resetSelection(); }); From f8bf5f805112752373a327f0bc0acd7111c61336 Mon Sep 17 00:00:00 2001 From: Anton Tsymuk Date: Thu, 22 Aug 2019 13:27:05 +0300 Subject: [PATCH 4/5] update package-lock.json --- package-lock.json | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e974b42..118302d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-item-runner-qti", - "version": "0.4.1", + "version": "0.4.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1234,11 +1234,6 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, - "eve": { - "version": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1", - "from": "git://github.com/adobe-webplatform/eve.git#eef80ed", - "dev": true - }, "external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -2782,8 +2777,11 @@ "resolved": "https://registry.npmjs.org/raphael/-/raphael-2.1.4.tgz", "integrity": "sha1-sJymZK0Ei4FLsv9dTR51g4yrnJc=", "dev": true, - "requires": { - "eve": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1" + "dependencies": { + "eve": { + "version": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1", + "from": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1" + } } }, "raw-body": { From 6e68f9c8be5ddfcc2f3ca7e6d32d6f4361e7a151 Mon Sep 17 00:00:00 2001 From: Pavel Handleman Date: Thu, 22 Aug 2019 14:24:42 +0300 Subject: [PATCH 5/5] version bump --- package-lock.json | 14 ++++++++------ package.json | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 118302d9..a3d29762 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-item-runner-qti", - "version": "0.4.2", + "version": "0.4.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1234,6 +1234,11 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, + "eve": { + "version": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1", + "from": "git://github.com/adobe-webplatform/eve.git#eef80ed", + "dev": true + }, "external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -2777,11 +2782,8 @@ "resolved": "https://registry.npmjs.org/raphael/-/raphael-2.1.4.tgz", "integrity": "sha1-sJymZK0Ei4FLsv9dTR51g4yrnJc=", "dev": true, - "dependencies": { - "eve": { - "version": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1", - "from": "git://github.com/adobe-webplatform/eve.git#eef80ed8d188423c2272746fb8ae5cc8dad84cb1" - } + "requires": { + "eve": "git://github.com/adobe-webplatform/eve.git#eef80ed" } }, "raw-body": { diff --git a/package.json b/package.json index a09b88f6..ca3ff05f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oat-sa/tao-item-runner-qti", - "version": "0.4.2", + "version": "0.4.3", "displayName": "TAO Item Runner QTI", "description": "TAO QTI Item Runner modules", "files": [