From 1f0e4f7480e47fd2f0552547b174ff9d938435ee Mon Sep 17 00:00:00 2001
From: Manuel Menezes de Sequeira <MMSequeira@gmail.com>
Date: Sun, 9 Mar 2014 21:59:32 +0000
Subject: Add localization support for SymbolMorph menu items.

---
 byob.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'byob.js')

diff --git a/byob.js b/byob.js
index 4b581e1..5946fd5 100644
--- a/byob.js
+++ b/byob.js
@@ -2579,7 +2579,7 @@ InputSlotDialogMorph.prototype.symbolMenu = function () {
         myself = this;
     SymbolMorph.prototype.names.forEach(function (symbol) {
         symbols.push([
-            [new SymbolMorph(symbol, myself.fontSize, symbolColor), symbol],
+            [new SymbolMorph(symbol, myself.fontSize, symbolColor), localize(symbol)],
             '$' + symbol
         ]);
     });
-- 
cgit v1.3.1


From ebb4b9301055ba94f53328f18a2c26657c66972f Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 30 Apr 2014 12:30:19 +0200
Subject: integrate localisation changes

---
 byob.js  | 7 +++++--
 paint.js | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'byob.js')

diff --git a/byob.js b/byob.js
index 5946fd5..9e0c067 100644
--- a/byob.js
+++ b/byob.js
@@ -106,7 +106,7 @@ SymbolMorph, isNil*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.byob = '2014-January-10';
+modules.byob = '2014-April-30';
 
 // Declarations
 
@@ -2579,7 +2579,10 @@ InputSlotDialogMorph.prototype.symbolMenu = function () {
         myself = this;
     SymbolMorph.prototype.names.forEach(function (symbol) {
         symbols.push([
-            [new SymbolMorph(symbol, myself.fontSize, symbolColor), localize(symbol)],
+            [
+                new SymbolMorph(symbol, myself.fontSize, symbolColor),
+                localize(symbol)
+            ],
             '$' + symbol
         ]);
     });
diff --git a/paint.js b/paint.js
index fd53122..44c988b 100644
--- a/paint.js
+++ b/paint.js
@@ -52,6 +52,7 @@
     September 16 - flood fill freeze fix (Kartik)
     Jan 08 - mouse leave dragging fix (Kartik)
     Feb 11 - dynamically adjust to stage dimensions (Jens)
+    Apr 30 - localizations (Manuel)
 
  */
 
@@ -65,7 +66,7 @@
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.paint = '2014-February-11';
+modules.paint = '2014-April-30';
 
 // Declarations
 
-- 
cgit v1.3.1


From a469f44afcf2c9b30c93f96d197f8e9862829933 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Wed, 30 Apr 2014 14:41:51 +0200
Subject: partial fix for #407

the label still is wrong
---
 byob.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'byob.js')

diff --git a/byob.js b/byob.js
index 9e0c067..e47f7c5 100644
--- a/byob.js
+++ b/byob.js
@@ -167,6 +167,9 @@ 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;
-- 
cgit v1.3.1


From f6561867d24f18b5ae803385f1475fce973fd548 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Fri, 2 May 2014 10:55:03 +0200
Subject: fixed #407 (custom-block coloring w/ zebra off)

---
 byob.js     | 11 ++++++-----
 history.txt |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'byob.js')

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)
-- 
cgit v1.3.1