fix issue with null labels

walterbender · walterbender · commit 1b14ad8b187f · 2017-03-04T15:02:06.000-05:00
diff --git a/js/activity.js b/js/activity.js
@@ -296,14 +296,6 @@ define(function (require) {
                             y += 100 * turlteBlocksScale;
                         }
                     }
-                    /*
-                    // Collapse collapsible stacks.
-                    if (['start', 'action', 'drum', 'matrix'].indexOf(myBlock.name) !== -1 && !myBlock.trash) {
-                        if (!myBlock.collapsed) {
-                            myBlock.collapseToggle();
-                        }
-                    }
-                    */
                 }
             }
 
diff --git a/js/palette.js b/js/palette.js
@@ -641,7 +641,7 @@ function PaletteModel(palette, palettes, name) {
                 }
             }
 
-            if (['do', 'nameddo', 'namedbox', 'namedcalc', 'doArg', 'calcArg', 'nameddoArg', 'namedcalcArg'].indexOf(protoBlock.name) != -1 && label.length > 8) {
+            if (['do', 'nameddo', 'namedbox', 'namedcalc', 'doArg', 'calcArg', 'nameddoArg', 'namedcalcArg'].indexOf(protoBlock.name) != -1 && label != null && label.length > 8) {
                 label = label.substr(0, 7) + '...';
             }
 

Original file line number	Diff line number	Diff line change
`@@ -296,14 +296,6 @@ define(function (require) {`
`296`	`296`	`y += 100 * turlteBlocksScale;`
`297`	`297`	`}`
`298`	`298`	`}`
`299`		`- /*`
`300`		`- // Collapse collapsible stacks.`
`301`		`- if (['start', 'action', 'drum', 'matrix'].indexOf(myBlock.name) !== -1 && !myBlock.trash) {`
`302`		`- if (!myBlock.collapsed) {`
`303`		`- myBlock.collapseToggle();`
`304`		`- }`
`305`		`- }`
`306`		`- */`
`307`	`299`	`}`
`308`	`300`	`}`
`309`	`301`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ function PaletteModel(palette, palettes, name) {`
`641`	`641`	`}`
`642`	`642`	`}`
`643`	`643`
`644`		`- if (['do', 'nameddo', 'namedbox', 'namedcalc', 'doArg', 'calcArg', 'nameddoArg', 'namedcalcArg'].indexOf(protoBlock.name) != -1 && label.length > 8) {`
	`644`	`+ if (['do', 'nameddo', 'namedbox', 'namedcalc', 'doArg', 'calcArg', 'nameddoArg', 'namedcalcArg'].indexOf(protoBlock.name) != -1 && label != null && label.length > 8) {`
`645`	`645`	`label = label.substr(0, 7) + '...';`
`646`	`646`	`}`
`647`	`647`