Merge branch 'dev'

onfe · Apr 6, 2020 · 362aa9b · 362aa9b
2 parents c9ab17f + ca597bd
commit 362aa9b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Picto",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/src/assets/js/sketchpad.js b/src/assets/js/sketchpad.js
@@ -34,10 +34,10 @@ class Sketchpad {
       "pointerdown",
       this.drawPix.bind(this)
     );
-    this.notepad.canvas.addEventListener(
-      "pointerleave",
-      this.resetMousePos.bind(this)
-    );
+    this.notepad.canvas.addEventListener("pointerleave", () => {
+      this.mousedown = false;
+      this.resetMousePos.bind(this);
+    });
 
     /**imageData is all the drawn pixels and baked text */
     this.imageData = {

diff --git a/src/store/compose.js b/src/store/compose.js
@@ -42,7 +42,7 @@ const actions = {
         .sort((a, b) => {
           a.id - b.id;
         })
-        .filter(a => a.type === "Message");
+        .filter(a => a.type === "Message" && !a.hidden);
       if (msgs.length < 1) {
         // eslint-disable-next-line no-console
         console.error("No messages to copy!");