diff --git a/package.json b/package.json index ea968fd8e02fe8d42b5c2eaaecde7baf7abd413a..4e60e963fab86da413c505fdfdb0d3b6660c2c42 100644 --- a/package.json +++ b/package.json @@ -92,12 +92,12 @@ "redux-throttle": "0.1.1", "rimraf": "^2.6.1", "scratch-audio": "0.1.0-prerelease.1528210666", - "scratch-blocks": "0.1.0-prerelease.1528384994", + "scratch-blocks": "0.1.0-prerelease.1528400332", "scratch-l10n": "3.0.20180604162003", "scratch-paint": "0.2.0-prerelease.20180607153112", "scratch-render": "0.1.0-prerelease.20180605145739", "scratch-storage": "0.5.0", - "scratch-vm": "0.1.0-prerelease.1528384542", + "scratch-vm": "0.1.0-prerelease.1528399883", "scratch-svg-renderer": "0.2.0-prerelease.20180607141644", "selenium-webdriver": "3.6.0", "startaudiocontext": "1.2.1", diff --git a/src/lib/blocks.js b/src/lib/blocks.js index fb858313c8451459ed8fde5968cd502c5d44bd0c..b47edc95d77dcc8aa9b0808c933a291486bef7e1 100644 --- a/src/lib/blocks.js +++ b/src/lib/blocks.js @@ -185,6 +185,14 @@ export default function (vm) { this.jsonInit(json); }; + ScratchBlocks.Blocks.event_touchingobjectmenu.init = function () { + const json = jsonForMenuBlock('TOUCHINGOBJECTMENU', spriteMenu, eventColors, [ + ['mouse-pointer', '_mouse_'], + ['edge', '_edge_'] + ]); + this.jsonInit(json); + }; + ScratchBlocks.Blocks.control_create_clone_of_menu.init = function () { const json = jsonForMenuBlock('CLONE_OPTION', cloneMenu, controlColors, []); this.jsonInit(json); diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js index a159f41dd74f4f4c197ff466b386ce0743fe359c..4088b3d8bd85afed688a3a09524437c38c35063f 100644 --- a/src/lib/make-toolbox-xml.js +++ b/src/lib/make-toolbox-xml.js @@ -321,6 +321,13 @@ const events = function (isStage) { ` : ` <block type="event_whenthisspriteclicked"/> `} + ${isStage ? '' : ` + <block type="event_whentouchingobject"> + <value name="TOUCHINGOBJECTMENU"> + <shadow type="event_touchingobjectmenu"/> + </value> + </block> + `} <block type="event_whenbackdropswitchesto"> </block> ${blockSeparator}