fixed #407 (custom-block coloring w/ zebra off)

2 files changed, 7 insertions, 5 deletions

diff --git a/byob.js b/byob.js
index e47f7c5..6a10110 100644
--- a/byob.js
+++ b/byob.js
@@ -106,7 +106,7 @@ SymbolMorph, isNil*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.byob = '2014-April-30';
+modules.byob = '2014-May-02';
 
 // Declarations
 
@@ -167,9 +167,6 @@ CustomBlockDefinition.prototype.templateInstance = function () {
     var block;
     block = this.blockInstance();
     block.refreshDefaults();
-    if (!block.zebraContrast) {
-        block.forceNormalColoring(); // label still is wrong
-    }
     block.isDraggable = false;
     block.isTemplate = true;
     return block;
@@ -375,8 +372,12 @@ CustomCommandBlockMorph.prototype.refresh = function () {
     this.setCategory(def.category);
     if (this.blockSpec !== newSpec) {
         oldInputs = this.inputs();
+        if (!this.zebraContrast) {
+            this.forceNormalColoring();
+        } else {
+            this.fixBlockColor();
+        }
         this.setSpec(newSpec);
-        this.fixBlockColor();
         this.fixLabelColor();
         this.restoreInputs(oldInputs);
     } else { // update all input slots' drop-downs
diff --git a/history.txt b/history.txt
index bcf8e5c..af54766 100755
--- a/history.txt
+++ b/history.txt
@@ -2124,3 +2124,4 @@ ______
 140502
 ------
 * error message when trying to import a non-text file into a variable, thanks, Nate!
+* fixed #407 (custom-block coloring w/ zebra off)