Merge remote-tracking branch 'origin/dragAndDrop' into dragAndDrop

doc/PROTOCOL.md

@@ -501,12 +501,11 @@ add data-dnd-id to a reference you can handle (probably SQL id)
 Request will be sent containing following information:
 {"id":2,"value":50,"position":5,"setTo":"after","otherId":4}
 
-id = id of the dragged object
-value = original value of the dragged object
-position = counted original position of the dragged object
+dragId = id of the dragged object
+dragPosition = counted original position of the dragged object
 setTo = "after" or "before"
-otherId = id of the element the dragged element is now before or after.
-otherPosition = Position of other element.
+hoverId = id of the element the dragged element is now hovering, meaning before or after.
+hoverPosition = Position of currently hovered element.
 
   
 ## Glossary

javascript/src/DragAndDrop.js

@@ -122,11 +122,11 @@ var QfqNS = QfqNS || {};
 
     n.DragAndDrop.prototype._buildOrderUpdate = function($object, position, otherId, otherPos) {
         var jObject = {};
-        jObject.id = $object.data("dnd-id");
-        jObject.position = $object.data("dnd-position");
+        jObject.dragId = $object.data("dnd-id");
+        jObject.dragPosition = $object.data("dnd-position");
         jObject.setTo = position;
-        jObject.otherId = otherId;
-        jObject.otherPosition = otherPos;
+        jObject.hoverId = otherId;
+        jObject.hoverPosition = otherPos;
         this._sendToAPI(jObject);
     };