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

pull/3/merge
jmoenig 2014-05-02 10:55:03 +02:00
rodzic 7edecf8255
commit f6561867d2
2 zmienionych plików z 7 dodań i 5 usunięć

11
byob.js
Wyświetl plik

@ -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

Wyświetl plik

@ -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)