From a69bbd4f8d8d76a05397e6c980dde69e5425e9c4 Mon Sep 17 00:00:00 2001
From: Adam Goldsmith <adam@adamgoldsmith.name>
Date: Thu, 28 Sep 2017 15:23:39 -0400
Subject: [PATCH] Make pile list behavior a bit less dumb

 - drag and drop doesn't jump all over the place
 - can't drag cards from list into piles
---
 js/playfield.js | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/js/playfield.js b/js/playfield.js
index cee858a..e12a0b3 100644
--- a/js/playfield.js
+++ b/js/playfield.js
@@ -1,6 +1,8 @@
 let deckName, deckJSON, cardCount, deckWidth, deckHeight,
     piles = {'deck': [], discard: []};
 
+interact.dynamicDrop(true);
+
 window.addEventListener('load', () => {
   let xhr = new XMLHttpRequest();
   xhr.addEventListener("load", () => {
@@ -73,12 +75,28 @@ interact('.card.in-list')
   })
   .dropzone({
     accept: '.card',
-    ondragenter: event => {
-      // TODO: drop after if cursor > 50% in card
+    ondropmove: event => {
       let target = event.target;
+      // TODO: there must be a better way to do this
+      let relCursorPos = (event.dragEvent.pageX -
+                          target.getBoundingClientRect().left) /
+          parseInt(window.getComputedStyle(target).width);
+
+      let oldOffsetLeft = event.relatedTarget.offsetLeft;
+      let oldOffsetTop = event.relatedTarget.offsetTop;
 
       // move the object in the DOM
-      target.parentElement.insertBefore(event.relatedTarget, target);
+      if (relCursorPos < 0.5 || relCursorPos === Infinity) {
+        target.parentElement.insertBefore(event.relatedTarget, target);
+      }
+      else {
+        target.parentElement.insertBefore(event.relatedTarget, target.nextSibling);
+      }
+
+      // update position
+      dragMoveListener({target: event.relatedTarget,
+                        dx: oldOffsetLeft - event.relatedTarget.offsetLeft,
+                        dy: oldOffsetTop - event.relatedTarget.offsetTop});
 
       // rebuild source pile
       piles[target.getAttribute('data-pile')] =
@@ -92,7 +110,6 @@ interact('.card.in-list')
 
     let listDiv = target.parentElement;
     // re-parent
-    target.parentElement.removeChild(target);
     document.querySelector("#card-container").appendChild(target);
 
     // rebuild source pile
@@ -109,7 +126,7 @@ interact('.card.in-list')
 
 interact('.card-pile')
   .dropzone({
-    accept: '.card',
+    accept: '.card:not(.in-pile)',
     ondrop: event => {
       // TODO: fix duped zeros
       let pileName = event.target.getAttribute('data-pile');