From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 7 Jun 2020 21:04:12 +0000 (+0100)
Subject: wip, g, draggable, etc.
X-Git-Tag: otter-0.2.0~1596
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=82a9a344f2f6f4542160d8794bd6efdd19784bec;p=otter.git

wip, g, draggable, etc.
---

diff --git a/templates/script.js b/templates/script.js
index 607c8834..09721052 100644
--- a/templates/script.js
+++ b/templates/script.js
@@ -13,10 +13,12 @@ space = document.getElementById('space');
   console.log('foo1');
 
 function drag_mousedown(e) {
+  drag_cancel();
   console.log('mousedown', e);
+  delt = e.target;
+  if (!delt.dataset.p) { return; }
   dcx = e.clientX;
   dcy = e.clientY;
-  delt = e.target;
   dox = parseFloat(delt.getAttributeNS(null,"x"));
   doy = parseFloat(delt.getAttributeNS(null,"y"));
   dragging = false;
@@ -48,8 +50,7 @@ function drag_mousemove(e) {
 function drag_mouseup(e) {
   console.log('mouseup');
   drag_mousemove(e);
-  window.removeEventListener('mousemove', drag_mousemove, true);
-  window.removeEventListener('mouseup',   drag_mouseup,   true);
+  drag_cancel(e);
   if (dragging) {
     console.log('dragged', ddx, ddy);
   } else {
@@ -57,6 +58,11 @@ function drag_mouseup(e) {
   }
 }
 
+function drag_cancel() {
+  window.removeEventListener('mousemove', drag_mousemove, true);
+  window.removeEventListener('mouseup',   drag_mouseup,   true);
+}
+
 es = new EventSource("updates");
 es.onmessage = function(event) {
   status_node.innerHTML = event.data;
diff --git a/templates/test.html b/templates/test.html
index 47484c64..cfe23984 100644
--- a/templates/test.html
+++ b/templates/test.html
@@ -10,9 +10,7 @@
  	 onmousedown="drag_mousedown(event)"
 	 >
       <rect fill="green" x="42" y="56" width="100" height="80"/>
-      <use href="#piece42" 
-	   x="50" y="80"
-	   />
+      <use href="#piece42" data-p="true" x="50" y="80" />
       <defs>
 	<g id="piece42">
 	  <circle