From 296d69659772aed3cb0592e765bcd2aeec515566 Mon Sep 17 00:00:00 2001 From: SharkPool <139097378+SharkPool-SP@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:56:55 -0700 Subject: [PATCH 1/2] Update cursor.js --- extensions/cursor.js | 70 ++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/extensions/cursor.js b/extensions/cursor.js index 575992c827..144a6cb9ac 100644 --- a/extensions/cursor.js +++ b/extensions/cursor.js @@ -155,40 +155,40 @@ ); const cursors = [ - "default", - "pointer", - "move", - "grab", - "grabbing", - "text", - "vertical-text", - "wait", - "progress", - "help", - "context-menu", - "zoom-in", - "zoom-out", - "crosshair", - "cell", - "not-allowed", - "copy", - "alias", - "no-drop", - "all-scroll", - "col-resize", - "row-resize", - "n-resize", - "e-resize", - "s-resize", - "w-resize", - "ne-resize", - "nw-resize", - "se-resize", - "sw-resize", - "ew-resize", - "ns-resize", - "nesw-resize", - "nwse-resize", + { text: Scratch.translate("default"), value: "default" }, + { text: Scratch.translate("pointer"), value: "pointer" }, + { text: Scratch.translate("move"), value: "move" }, + { text: Scratch.translate("grab"), value: "grab" }, + { text: Scratch.translate("grabbing"), value: "grabbing" }, + { text: Scratch.translate("text"), value: "text" }, + { text: Scratch.translate("vertical-text"), value: "vertical-text" }, + { text: Scratch.translate("wait"), value: "wait" }, + { text: Scratch.translate("progress"), value: "progress" }, + { text: Scratch.translate("help"), value: "help" }, + { text: Scratch.translate("context-menu"), value: "context-menu" }, + { text: Scratch.translate("zoom-in"), value: "zoom-in" }, + { text: Scratch.translate("zoom-out"), value: "zoom-ou" }, + { text: Scratch.translate("crosshair"), value: "crosshair" }, + { text: Scratch.translate("cell"), value: "cell" }, + { text: Scratch.translate("not-allowed"), value: "not-allowed" }, + { text: Scratch.translate("copy"), value: "copy" }, + { text: Scratch.translate("alias"), value: "alias" }, + { text: Scratch.translate("no-drop"), value: "no-drop" }, + { text: Scratch.translate("all-scroll"), value: "all-scroll" }, + { text: Scratch.translate("column-resize"), value: "col-resize" }, + { text: Scratch.translate("row-resize"), value: "row-resize" }, + { text: Scratch.translate("n-resize"), value: "n-resize" }, + { text: Scratch.translate("e-resize"), value: "e-resize" }, + { text: Scratch.translate("s-resize"), value: "s-resize" }, + { text: Scratch.translate("w-resize"), value: "w-resize" }, + { text: Scratch.translate("ne-resize"), value: "ne-resize" }, + { text: Scratch.translate("nw-resize"), value: "nw-resize" }, + { text: Scratch.translate("se-resize"), value: "se-resize" }, + { text: Scratch.translate("sw-resize"), value: "sw-resize" }, + { text: Scratch.translate("ew-resize"), value: "ew-resize" }, + { text: Scratch.translate("ns-resize"), value: "ns-resize" }, + { text: Scratch.translate("nesw-resize"), value: "nesw-resize" }, + { text: Scratch.translate("nwse-resize"), value: "nwse-resize" }, ]; class MouseCursor { @@ -285,7 +285,7 @@ setCur(args) { const newCursor = Scratch.Cast.toString(args.cur); // Prevent setting cursor to "url(...), default" from causing fetch. - if (cursors.includes(newCursor) || newCursor === "none") { + if (cursors.some((e) => e.value === newCursor) || newCursor === "none") { nativeCursor = newCursor; customCursorImageName = null; currentCanvasCursor = newCursor; From afd2aa43f91fef0e100dc95f2d9d7a066ae9cd8e Mon Sep 17 00:00:00 2001 From: SharkPool <139097378+SharkPool-SP@users.noreply.github.com> Date: Wed, 9 Apr 2025 20:17:44 -0700 Subject: [PATCH 2/2] Update cursor.js --- extensions/cursor.js | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/extensions/cursor.js b/extensions/cursor.js index 144a6cb9ac..00865b8891 100644 --- a/extensions/cursor.js +++ b/extensions/cursor.js @@ -155,40 +155,40 @@ ); const cursors = [ - { text: Scratch.translate("default"), value: "default" }, - { text: Scratch.translate("pointer"), value: "pointer" }, - { text: Scratch.translate("move"), value: "move" }, - { text: Scratch.translate("grab"), value: "grab" }, - { text: Scratch.translate("grabbing"), value: "grabbing" }, - { text: Scratch.translate("text"), value: "text" }, - { text: Scratch.translate("vertical-text"), value: "vertical-text" }, - { text: Scratch.translate("wait"), value: "wait" }, - { text: Scratch.translate("progress"), value: "progress" }, - { text: Scratch.translate("help"), value: "help" }, - { text: Scratch.translate("context-menu"), value: "context-menu" }, - { text: Scratch.translate("zoom-in"), value: "zoom-in" }, - { text: Scratch.translate("zoom-out"), value: "zoom-ou" }, - { text: Scratch.translate("crosshair"), value: "crosshair" }, - { text: Scratch.translate("cell"), value: "cell" }, - { text: Scratch.translate("not-allowed"), value: "not-allowed" }, - { text: Scratch.translate("copy"), value: "copy" }, - { text: Scratch.translate("alias"), value: "alias" }, - { text: Scratch.translate("no-drop"), value: "no-drop" }, - { text: Scratch.translate("all-scroll"), value: "all-scroll" }, - { text: Scratch.translate("column-resize"), value: "col-resize" }, - { text: Scratch.translate("row-resize"), value: "row-resize" }, - { text: Scratch.translate("n-resize"), value: "n-resize" }, - { text: Scratch.translate("e-resize"), value: "e-resize" }, - { text: Scratch.translate("s-resize"), value: "s-resize" }, - { text: Scratch.translate("w-resize"), value: "w-resize" }, - { text: Scratch.translate("ne-resize"), value: "ne-resize" }, - { text: Scratch.translate("nw-resize"), value: "nw-resize" }, - { text: Scratch.translate("se-resize"), value: "se-resize" }, - { text: Scratch.translate("sw-resize"), value: "sw-resize" }, - { text: Scratch.translate("ew-resize"), value: "ew-resize" }, - { text: Scratch.translate("ns-resize"), value: "ns-resize" }, - { text: Scratch.translate("nesw-resize"), value: "nesw-resize" }, - { text: Scratch.translate("nwse-resize"), value: "nwse-resize" }, + { text: Scratch.translate("(1) default"), value: "default" }, + { text: Scratch.translate("(2) pointer"), value: "pointer" }, + { text: Scratch.translate("(3) move"), value: "move" }, + { text: Scratch.translate("(4) grab"), value: "grab" }, + { text: Scratch.translate("(5) grabbing"), value: "grabbing" }, + { text: Scratch.translate("(6) text"), value: "text" }, + { text: Scratch.translate("(7) vertical-text"), value: "vertical-text" }, + { text: Scratch.translate("(8) wait"), value: "wait" }, + { text: Scratch.translate("(9) progress"), value: "progress" }, + { text: Scratch.translate("(10) help"), value: "help" }, + { text: Scratch.translate("(11) context-menu"), value: "context-menu" }, + { text: Scratch.translate("(12) zoom-in"), value: "zoom-in" }, + { text: Scratch.translate("(13) zoom-out"), value: "zoom-ou" }, + { text: Scratch.translate("(14) crosshair"), value: "crosshair" }, + { text: Scratch.translate("(15) cell"), value: "cell" }, + { text: Scratch.translate("(16) not-allowed"), value: "not-allowed" }, + { text: Scratch.translate("(17) copy"), value: "copy" }, + { text: Scratch.translate("(18) alias"), value: "alias" }, + { text: Scratch.translate("(19) no-drop"), value: "no-drop" }, + { text: Scratch.translate("(20) all-scroll"), value: "all-scroll" }, + { text: Scratch.translate("(21) column-resize"), value: "col-resize" }, + { text: Scratch.translate("(22) row-resize"), value: "row-resize" }, + { text: Scratch.translate("(23) n-resize"), value: "n-resize" }, + { text: Scratch.translate("(24) e-resize"), value: "e-resize" }, + { text: Scratch.translate("(25) s-resize"), value: "s-resize" }, + { text: Scratch.translate("(26) w-resize"), value: "w-resize" }, + { text: Scratch.translate("(27) ne-resize"), value: "ne-resize" }, + { text: Scratch.translate("(28) nw-resize"), value: "nw-resize" }, + { text: Scratch.translate("(29) se-resize"), value: "se-resize" }, + { text: Scratch.translate("(30) sw-resize"), value: "sw-resize" }, + { text: Scratch.translate("(31) ew-resize"), value: "ew-resize" }, + { text: Scratch.translate("(32) ns-resize"), value: "ns-resize" }, + { text: Scratch.translate("(33) nesw-resize"), value: "nesw-resize" }, + { text: Scratch.translate("(34) nwse-resize"), value: "nwse-resize" }, ]; class MouseCursor {