Merge branch 'pr/1718' into dev

llaske · Jan 30, 2025 · fcf965d · fcf965d
2 parents 2adf51c + f11ad73
commit fcf965d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Info Update : Planet Activity #1709
 - Minute numbers still visible in clock activity even after switching to Nice Clock #1713
 - Default Promotion to Queen in Chess Activity #1704
+- Error loading Etoys activity #1717
 
 ## [1.8.0] - 2024-04-10
 ### Added

diff --git a/README.md b/README.md
@@ -234,7 +234,7 @@ To remove media content for **Abecedarium**, remove directories:
 
 The activity will look for media content on the server referenced in [activities/Abecedarium.activity/database/db_url.json](activities/Abecedarium.activity/database/db_url.json), by default `http://server.sugarizer.org/activities/Abecedarium.activity/`.
 
-To remove resources for **Etoys**, remove directory [activities/Etoys.activity/resources](activities/Etoys.activity/resources) and replace the value `resources/etoys.image` in [activities/Etoys.activity/index.html](activities/Etoys.activity/index.html) by the remote location of the resources, for example `http://server.sugarizer.org/activities/Etoys.activity/resources/etoys.image`.
+To remove resources for **Etoys**, remove directory [activities/Etoys.activity/resources](activities/Etoys.activity/resources) and the file [activities/Etoys.activity/etoys.image](activities/Etoys.activity/etoys.image). Then replace the value `resources/etoys.image` in [activities/Etoys.activity/index.html](activities/Etoys.activity/index.html) by the remote location of the resources, for example `http://server.sugarizer.org/activities/Etoys.activity/etoys.image`.
 
 To remove resources for **Scratch**, remove directory [activities/Scratch.activity/static/internal-assets](activities/Scratch.activity/static/internal-assets) and remove the value `class="offlinemode"` in [activities/Scratch.activity/index.html](activities/Scratch.activity/index.html).
 

diff --git a/...ties/Etoys.activity/resources/etoys.image → activities/Etoys.activity/etoys.image b/...ties/Etoys.activity/resources/etoys.image → activities/Etoys.activity/etoys.image
diff --git a/activities/Etoys.activity/index.html b/activities/Etoys.activity/index.html
@@ -27,13 +27,16 @@
 <script src="squeak.min.js"></script>
 <script>
 window.onload = function() {
-    SqueakJS.runSqueak("resources/etoys.image", sqCanvas, {
+    SqueakJS.runSqueak("etoys.image", sqCanvas, {
         appName: "Etoys",
         fixedWidth: 1200,
         fixedHeight: 900,
         fullscreen: true,
         spinner: sqSpinner,
-        files: ["etoys.changes", "EtoysV5.stc"],
+        files: [
+            "resources/etoys.changes",
+            "resources/EtoysV5.stc"
+        ],
         root: "/Etoys",
         templates: { "/Etoys": "resources" },
         onQuit: function() {