fixed #601

correctly display symbol for %obj type input slots in the prototype
template

2 files changed, 12 insertions, 2 deletions

diff --git a/blocks.js b/blocks.js
index 0c265fc..73ef884 100644
--- a/blocks.js
+++ b/blocks.js
@@ -155,7 +155,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2014-September-30';
+modules.blocks = '2014-October-01';
 
 
 var SyntaxElementMorph;
@@ -656,7 +656,9 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
     var part, tokens;
     if (spec[0] === '%' &&
             spec.length > 1 &&
-            this.selector !== 'reportGetVar') {
+            (this.selector !== 'reportGetVar' ||
+                (spec === '%turtleOutline' && this.isObjInputFragment()))) {
+
         // check for variable multi-arg-slot:
         if ((spec.length > 5) && (spec.slice(0, 5) === '%mult')) {
             part = new MultiArgMorph(spec.slice(5));
@@ -1361,6 +1363,13 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
     return part;
 };
 
+SyntaxElementMorph.prototype.isObjInputFragment = function () {
+    // private - for displaying a symbol in a variable block template
+    return (this.selector === 'reportGetVar') &&
+        (this.getSlotSpec() === '%t') &&
+        (this.parent.fragment.type === '%obj');
+};
+
 // SyntaxElementMorph layout:
 
 SyntaxElementMorph.prototype.fixLayout = function () {
diff --git a/history.txt b/history.txt
index 19b962a..4f6b8a7 100755
--- a/history.txt
+++ b/history.txt
@@ -2295,3 +2295,4 @@ ______
 ------
 * Threads: workaround for some REPORT issues
 * Objects: fixed #599 (disable IDE keyboard shortcuts in presentation mode)
+* Objects: correctly display symbol for %obj type input slots in the prototype template