From 21989281937891b89c8cd4bfeb53027a7d14640e Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 20 Oct 2020 22:08:34 -0400
Subject: fixed list operation synchronizatoin on server and made
 preselementbox change

---
 src/client/views/presentationview/PresElementBox.tsx | 2 +-
 src/server/websocket.ts                              | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/client/views/presentationview/PresElementBox.tsx b/src/client/views/presentationview/PresElementBox.tsx
index 9e1a7b615..6fde7c2ac 100644
--- a/src/client/views/presentationview/PresElementBox.tsx
+++ b/src/client/views/presentationview/PresElementBox.tsx
@@ -175,7 +175,7 @@ export class PresElementBox extends ViewBoxBaseComponent<FieldViewProps, PresDoc
         } else if (dragArray.length >= 1) {
             const doc = document.createElement('div');
             doc.className = "presItem-multiDrag";
-            doc.innerText = "Move " + dragArray.length + " slides";
+            doc.innerText = "Move " + PresBox.Instance._selectedArray.length + " slides";
             doc.style.position = 'absolute';
             doc.style.top = (e.clientY) + 'px';
             doc.style.left = (e.clientX - 50) + 'px';
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index 34ef3d8b3..7d111f359 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -291,8 +291,8 @@ export namespace WebSocket {
                     socket.broadcast.emit(MessageStore.UpdateField.Message, diff);
                     socket.id = id;
                 } else socket.broadcast.emit(MessageStore.UpdateField.Message, diff);
+                dispatchNextOp(diff.id);
             }, false);
-        dispatchNextOp(diff.id);
     }
 
     function remFromListField(socket: Socket, diff: Diff, curListItems?: Transferable): void {
@@ -312,8 +312,8 @@ export namespace WebSocket {
                     socket.broadcast.emit(MessageStore.UpdateField.Message, diff);
                     socket.id = id;
                 } else socket.broadcast.emit(MessageStore.UpdateField.Message, diff);
+                dispatchNextOp(diff.id);
             }, false);
-        dispatchNextOp(diff.id);
     }
 
     const pendingOps = new Map<string, { diff: Diff, socket: Socket }[]>();
@@ -338,15 +338,13 @@ export namespace WebSocket {
             pendingOps.get(diff.id)!.push({ diff, socket });
             return true;
         }
+        pendingOps.set(diff.id, [{ diff, socket }]);
         if (diff.diff.$addToSet) {
-            pendingOps.set(diff.id, [{ diff, socket }]);
             return GetRefFieldLocal([diff.id, (result?: Transferable) => addToListField(socket, diff, result)]); // would prefer to have Mongo handle list additions direclty, but for now handle it on our own
         }
         if (diff.diff.$remFromSet) {
-            pendingOps.set(diff.id, [{ diff, socket }]);
             return GetRefFieldLocal([diff.id, (result?: Transferable) => remFromListField(socket, diff, result)]); // would prefer to have Mongo handle list additions direclty, but for now handle it on our own
         }
-        pendingOps.set(diff.id, [{ diff, socket }]);
         return GetRefFieldLocal([diff.id, (result?: Transferable) => SetField(socket, diff, result)]);
     }
     function SetField(socket: Socket, diff: Diff, curListItems?: Transferable) {
-- 
cgit v1.2.3-70-g09d2