From 8a1ca3116b834625e6f71c6376c115975d4f9d75 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Thu, 9 Jan 2014 15:34:12 +0100
Subject: Collapse STOP primitives into a single block with a dropdown of
 options

---
 blocks.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'blocks.js')

diff --git a/blocks.js b/blocks.js
index 1ad2239..9997d70 100644
--- a/blocks.js
+++ b/blocks.js
@@ -155,7 +155,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2014-January-08';
+modules.blocks = '2014-January-09';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -1037,6 +1037,20 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
             );
             part.setContents(['encode URI']);
             break;
+        case '%stopChoices':
+            part = new InputSlotMorph(
+                null,
+                false,
+                {
+                    'all' : ['all'],
+                    'this script' : ['this script'],
+                    'this block' : ['this block']
+                },
+                true
+            );
+            part.setContents(['all']);
+            part.isStatic = true;
+            break;
         case '%stopOthersChoices':
             part = new InputSlotMorph(
                 null,
@@ -3279,6 +3293,7 @@ CommandBlockMorph.prototype.snap = function () {
 
 CommandBlockMorph.prototype.isStop = function () {
     return ([
+        'doStopThis',
         'doStop',
         'doStopBlock',
         'doStopAll',
-- 
cgit v1.3.1