Merge branch 'develop' into refactor/dropdown

lindapaiste · Nov 29, 2023 · 2b592b9 · 2b592b9
2 parents 3ee9899 + f725abd
commit 2b592b9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/client/modules/IDE/components/Header/Toolbar.jsx b/client/modules/IDE/components/Header/Toolbar.jsx
@@ -87,6 +87,9 @@ const Toolbar = (props) => {
           checked={autorefresh}
           onChange={(event) => {
             dispatch(setAutorefresh(event.target.checked));
+            if (event.target.checked) {
+              dispatch(startSketch());
+            }
           }}
         />
         <label htmlFor="autorefresh" className="toolbar__autorefresh-label">

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.9.3",
+  "version": "2.10.0",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",

diff --git a/server/controllers/session.controller.js b/server/controllers/session.controller.js
@@ -36,6 +36,12 @@ export function destroySession(req, res, next) {
       next(err);
       return;
     }
-    res.json({ success: true });
+    req.session.destroy((error) => {
+      if (error) {
+        next(error);
+        return;
+      }
+      res.json({ success: true });
+    });
   });
 }
diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js
@@ -9,8 +9,8 @@ function draw() {
 export const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.8.0/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.8.0/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.0/p5.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.0/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />