changeset 2459:e8145f5f49b7

Stopped APE from being dragged out of bounds
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Mon, 06 Jun 2016 11:10:59 +0100
parents 701636813780
children 0ff4a9925597
files interfaces/ape.js
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/ape.js	Sun Jun 05 16:26:58 2016 +0200
+++ b/interfaces/ape.js	Mon Jun 06 11:10:59 2016 +0100
@@ -395,7 +395,11 @@
 		event.preventDefault();
 		var obj = interfaceContext.getSelectedObject();
 		if (obj == null) {return;}
-		$(obj).css("left",event.clientX-6 + "px");
+        var move = event.clientX-6;
+        var w = $(event.currentTarget).width();
+        move = Math.max(50,move);
+        move = Math.min(w+50,move);
+		$(obj).css("left",move + "px");
 		interfaceContext.moveObject();
 	});
 	
@@ -404,6 +408,9 @@
 		var obj = interfaceContext.getSelectedObject();
 		if (obj == null) {return;}
 		var move = event.originalEvent.targetTouches[0].clientX - 6;
+        var w = $(event.currentTarget).width();
+        move = Math.max(50,move);
+        move = Math.min(w+50,move);
 		$(obj).css("left",move + "px");
 		interfaceContext.moveObject();
 	});