From 0aea33d8a6d7d7aa5420dea71edb67c7ccb63f5f Mon Sep 17 00:00:00 2001
From: Sam El-Husseini <sam.elhusseini@gmail.com>
Date: Fri, 1 Nov 2019 12:21:05 -0700
Subject: [PATCH] Make theme validate style method work with advanced
 compilation (#3384)

---
 core/theme.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/theme.js b/core/theme.js
index 3deadde3a..d4b7ef70c 100644
--- a/core/theme.js
+++ b/core/theme.js
@@ -170,18 +170,18 @@ Blockly.Theme.validatedBlockStyle = function(blockStyle) {
 
   // Validate required properties.
   var parsedColour = Blockly.utils.colour.parseBlockColour(
-      valid.colourPrimary || '#000');
+      valid['colourPrimary'] || '#000');
   valid.colourPrimary = parsedColour.hex;
-  valid.colourSecondary = valid.colourSecondary ?
-      Blockly.utils.colour.parseBlockColour(valid.colourSecondary).hex :
+  valid.colourSecondary = valid['colourSecondary'] ?
+      Blockly.utils.colour.parseBlockColour(valid['colourSecondary']).hex :
       Blockly.utils.colour.blend('#fff', valid.colourPrimary, 0.6) ||
       valid.colourPrimary;
   valid.colourTertiary = valid.colourTertiary ?
-      Blockly.utils.colour.parseBlockColour(valid.colourTertiary).hex :
+      Blockly.utils.colour.parseBlockColour(valid['colourTertiary']).hex :
       Blockly.utils.colour.blend('#fff', valid.colourPrimary, 0.3) ||
       valid.colourPrimary;
 
-  valid.hat = valid.hat || '';
+  valid.hat = valid['hat'] || '';
   return valid;
 };