bump version 0.10.3

- fix draw order on scrollback
toger5 · Aug 22, 2021 · e7f7eac · e7f7eac
1 parent 6b5f8e3
commit e7f7eac
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "theboard_matrix",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "description": "A Whiteboard using the matrix protocol for collaboration and cloud storage",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0",

diff --git a/src/backend/matrix.js b/src/backend/matrix.js
@@ -125,9 +125,12 @@ export default class MatrixBackend {
         this.client.on("Room.timeline", function (msg, room, toStartOfTimeline) {
             if (msg.isRedacted()) { return; } // skipp redacted events
             if (isBoardObjectEvent(msg.getType())) {
-                let animated = Date.now() - msg.getDate().getTime() < 200000;
+                let age = Date.now() - msg.getDate().getTime();
+                console.log("age ", age)
+                let animated = Date.now() - msg.getDate().getTime() < 10000;
+                let toBeginningOfTimeline = !animated;
                 if (msg.event.room_id === appData.matrixClient.currentRoomId) {
-                    appData.drawingCanvas.drawEvent(msg.event, animated);
+                    appData.drawingCanvas.drawEvent(msg.event, animated, toBeginningOfTimeline);
                 }
                 if (msg.status == null) {
                     // event already has a proper ID. because it is not status == sending, but loaded from scrollback

diff --git a/src/paper-canvas.js b/src/paper-canvas.js
@@ -10,7 +10,7 @@ export default class PaperCanvas {
         this.drawLayer = null;
         this.canvas = null;
     }
-    drawEvent(event, animated) {
+    drawEvent(event, animated, toBeginningOfTimeline = false) {
         let drawC = appData.drawingCanvas;
         function pathV1() {
             if (event.content.objtype != "p.path") { return }
@@ -19,13 +19,15 @@ export default class PaperCanvas {
             let pos = parsePoint(event.content.objpos);
             let size = parsePoint(event.content.objsize);
             let color = "objcolor" in event.content ? event.content.objcolor : "#000"
+            let addedPath;
             if (animated) {
                 drawC.asyncAddPathV1([pos.x, pos.y], points, color);
             } else {
                 drawC.drawBoundingBox([[pos.x, pos.y], size]);
-                drawC.addPathV1(points, color, [[pos.x, pos.y], size], event.event_id);
+                addedPath = drawC.addPathV1(points, color, [[pos.x, pos.y], size], event.event_id);
                 if (updateDisplay) { drawC.updateDisplay_DEPRECATED(true); }
             }
+            return addedPath
         }
         function pathV2() {
             if (event.content.objtype != "p.path") { return }
@@ -34,45 +36,54 @@ export default class PaperCanvas {
             let closed = ("closed" in event.content && event.content.closed)
             let color = "objcolor" in event.content ? event.content.objcolor : "#000"
             let fillColor = "objFillColor" in event.content ? event.content.objFillColor : "#00000000"
-
+            let addedPath;
             if (animated) {
-                drawC.asyncAddPathV2(segments, color, fillColor, strokeWidth, closed, event.event_id);
+                addedPath = drawC.asyncAddPathV2(segments, color, fillColor, strokeWidth, closed, event.event_id);
             } else {
-                drawC.addPathV2(segments, color, fillColor, strokeWidth, closed, event.event_id);
+                addedPath = drawC.addPathV2(segments, color, fillColor, strokeWidth, closed, event.event_id);
             }
-
+            return addedPath
         }
         function pathV3() {
             for (let pathData of event.content.paths) {
                 let addPathFunc = animated ? drawC.asyncAddPathV3 : drawC.addPathV3
-                addPathFunc(pathData, event.event_id)
+                return addPathFunc(pathData, event.event_id)
             }
         }
 
         function evPath() {
             if (!("version" in event.content)) {
                 pathV1(); return
             }
+            let addedPath;
             switch (event.content.version) {
-                case 1: pathV1(); break;
-                case 2: pathV2(); break;
-                case 3: pathV3(); break;
+                case 1: addedPath = pathV1(); break;
+                case 2: addedPath = pathV2(); break;
+                case 3: addedPath = pathV3(); break;
             }
+            return addedPath;
         }
         function evText() {
-            drawC.addText(event.content, event.event_id)
+            return drawC.addText(event.content, event.event_id)
         }
         function evImage() {
-            drawC.addImage(event.content, event.event_id)
+            return drawC.addImage(event.content, event.event_id)
         }
-
+        let addedItem;
         switch (event.content.objtype) {
             case "path":
             case "p.path":
-                evPath()
+                addedItem = evPath()
                 break;
-            case "text": evText(); break;
-            case "image": evImage(); break;
+            case "text": addedItem = evText(); break;
+            case "image": addedItem = evImage(); break;
+        }
+        if(addedItem){
+            if (toBeginningOfTimeline) {
+                addedItem.sendToBack()
+            }
+        }else{
+            console.log("no addedItem")
         }
     }
 
@@ -146,6 +157,7 @@ export default class PaperCanvas {
         p.tween({ dashOffset: length }, { dashOffset: 0 }, 2 * length).then(() => {
             p.dashArray = []
         })
+        return p
         // p.tween({ dashArray: [10, 10] }, { dashArray: [1000, 10] }, 3000);
     }
     asyncAddPathV3(pathContent, id) {
@@ -210,6 +222,7 @@ export default class PaperCanvas {
             p.lineTo(new paper.Point(points[i][1], points[i][2]));
         }
         p.tween({ opacity: 0.0 }, { opacity: 1.0 }, 800)
+        return p
     }
 
     addText(textContent, id) {
@@ -225,6 +238,7 @@ export default class PaperCanvas {
             text.data.id = id
         }
         text.tween({ opacity: 0.0 }, { opacity: 1.0 }, 800)
+        return text
     }
     addImage(imageContent, id) {
         let url = imageContent.url;