diff --git a/contenido/05.html b/contenido/05.html index 68433c1..5cd9a2e 100644 --- a/contenido/05.html +++ b/contenido/05.html @@ -49,7 +49,7 @@
-
+
@@ -203,7 +203,6 @@ $('.card-drag').draggable({ revert: 'invalid', revertDuration: 300, - containment: "#drag-drop-activity", cursor: "grabbing", start: function (event, ui) { $(this).css('z-index', 1000); @@ -211,10 +210,11 @@ ui.position.top = 0; }, drag: function (event, ui) { + var scale = parseFloat($('.wrap-course-content').css('transform').split('(')[1]) || 1; var changeLeft = ui.position.left - ui.originalPosition.left; - var newLeft = ui.originalPosition.left + changeLeft; + var newLeft = ui.originalPosition.left + changeLeft / scale; var changeTop = ui.position.top - ui.originalPosition.top; - var newTop = ui.originalPosition.top + changeTop; + var newTop = ui.originalPosition.top + changeTop / scale; ui.position.left = newLeft; ui.position.top = newTop; }, diff --git a/contenido/14.html b/contenido/14.html index 9517988..55ad5be 100644 --- a/contenido/14.html +++ b/contenido/14.html @@ -142,6 +142,16 @@ tolerance: 'pointer', helper: "clone", cursorAt: { top: 50, left: 50 }, + sort: function (event, ui) { + var scale = parseFloat($('.wrap-course-content').css('transform').split('(')[1]) || 1; + var offset = ui.helper.offset(); + var mouseX = event.pageX; + var mouseY = event.pageY; + ui.helper.css({ + left: (mouseX - ui.helper.parent().offset().left) / scale - ui.helper.width() / 4, + top: (mouseY - ui.helper.parent().offset().top) / scale - ui.helper.height() / 2 + }); + }, update: function() { checkOrder(); } diff --git a/contenido/15.html b/contenido/15.html index 3c6c804..00c58b5 100644 --- a/contenido/15.html +++ b/contenido/15.html @@ -72,7 +72,7 @@
-
+
@@ -201,7 +201,6 @@ $newDrag.draggable({ revert: 'invalid', revertDuration: 300, - containment: "#drag-drop-activity", cursor: "grabbing", start: function (event, ui) { $(this).css('z-index', 1000); @@ -209,10 +208,11 @@ ui.position.top = 0; }, drag: function (event, ui) { + var scale = parseFloat($('.wrap-course-content').css('transform').split('(')[1]) || 1; var changeLeft = ui.position.left - ui.originalPosition.left; - var newLeft = ui.originalPosition.left + changeLeft; + var newLeft = ui.originalPosition.left + changeLeft / scale; var changeTop = ui.position.top - ui.originalPosition.top; - var newTop = ui.originalPosition.top + changeTop; + var newTop = ui.originalPosition.top + changeTop / scale; ui.position.left = newLeft; ui.position.top = newTop; }, diff --git a/contenido/17.html b/contenido/17.html index ce6ab2d..9484004 100644 --- a/contenido/17.html +++ b/contenido/17.html @@ -46,7 +46,7 @@
-
+
@@ -142,7 +142,6 @@ $('.btn-drag').draggable({ revert: 'invalid', revertDuration: 300, - containment: "#drag-drop-activity", cursor: "grabbing", start: function (event, ui) { $(this).css('z-index', 1000); @@ -150,10 +149,11 @@ ui.position.top = 0; }, drag: function (event, ui) { + var scale = parseFloat($('.wrap-course-content').css('transform').split('(')[1]) || 1; var changeLeft = ui.position.left - ui.originalPosition.left; - var newLeft = ui.originalPosition.left + changeLeft; + var newLeft = ui.originalPosition.left + changeLeft / scale; var changeTop = ui.position.top - ui.originalPosition.top; - var newTop = ui.originalPosition.top + changeTop; + var newTop = ui.originalPosition.top + changeTop / scale; ui.position.left = newLeft; ui.position.top = newTop; },