correctly display symbol for %obj type input slots in the prototype
template
pull/3/merge
jmoenig 2014-10-01 12:31:36 +02:00
rodzic 86672fec4a
commit 57a16b3b31
2 zmienionych plików z 12 dodań i 2 usunięć

Wyświetl plik

@ -155,7 +155,7 @@ DialogBoxMorph, BlockInputFragmentMorph, PrototypeHatBlockMorph, Costume*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2014-September-30'; modules.blocks = '2014-October-01';
var SyntaxElementMorph; var SyntaxElementMorph;
@ -656,7 +656,9 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
var part, tokens; var part, tokens;
if (spec[0] === '%' && if (spec[0] === '%' &&
spec.length > 1 && spec.length > 1 &&
this.selector !== 'reportGetVar') { (this.selector !== 'reportGetVar' ||
(spec === '%turtleOutline' && this.isObjInputFragment()))) {
// check for variable multi-arg-slot: // check for variable multi-arg-slot:
if ((spec.length > 5) && (spec.slice(0, 5) === '%mult')) { if ((spec.length > 5) && (spec.slice(0, 5) === '%mult')) {
part = new MultiArgMorph(spec.slice(5)); part = new MultiArgMorph(spec.slice(5));
@ -1361,6 +1363,13 @@ SyntaxElementMorph.prototype.labelPart = function (spec) {
return part; 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 layout:
SyntaxElementMorph.prototype.fixLayout = function () { SyntaxElementMorph.prototype.fixLayout = function () {

Wyświetl plik

@ -2295,3 +2295,4 @@ ______
------ ------
* Threads: workaround for some REPORT issues * Threads: workaround for some REPORT issues
* Objects: fixed #599 (disable IDE keyboard shortcuts in presentation mode) * Objects: fixed #599 (disable IDE keyboard shortcuts in presentation mode)
* Objects: correctly display symbol for %obj type input slots in the prototype template