From 7550cb1e96cd0d56bfe66b55139b8d1afd325106 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Fri, 14 Oct 2016 02:20:25 -0700
Subject: [PATCH] Fix loading of Block Factory in Firefox.

---
 core/workspace_svg.js          | 5 ++++-
 demos/blockfactory/factory.css | 8 ++++----
 demos/blockfactory/index.html  | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 5d5345c54..ce2bfeef5 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -187,7 +187,10 @@ Blockly.WorkspaceSvg.prototype.getInverseScreenCTM = function() {
  * Update the inverted screen CTM.
  */
 Blockly.WorkspaceSvg.prototype.updateInverseScreenCTM = function() {
-  this.inverseScreenCTM_ = this.getParentSvg().getScreenCTM().inverse();
+  var ctm = this.getParentSvg().getScreenCTM();
+  if (ctm) {
+    this.inverseScreenCTM_ = ctm.inverse();
+  }
 };
 
 /**
diff --git a/demos/blockfactory/factory.css b/demos/blockfactory/factory.css
index 69c6c833e..9d3e85d5b 100644
--- a/demos/blockfactory/factory.css
+++ b/demos/blockfactory/factory.css
@@ -512,19 +512,19 @@ td.taboff:hover {
   border: 0;
   text-align: center;
   vertical-align: middle;
-  border-right: 1px solid #000000;
+  border-right: 1px solid #000;
   font-size: 1px;
 }
 
 .goog-palette-colorswatch {
-  border: 1px solid #000000;
+  border: 1px solid #000;
   height: 13px;
   position: relative;
   width: 15px;
 }
 
 .goog-palette-cell-hover .goog-palette-colorswatch {
-  border: 1px solid #FFF;
+  border: 1px solid #fff;
 }
 
 .goog-palette-cell-selected .goog-palette-colorswatch {
@@ -548,7 +548,7 @@ td.taboff:hover {
 
 /* Dropdown Content (Hidden by Default) */
 .dropdown-content {
-  background-color: #FFF;
+  background-color: #fff;
   box-shadow: 0px 8px 16px 0px rgba(0,0,0,.2);
   display: none;
   min-width: 170px;
diff --git a/demos/blockfactory/index.html b/demos/blockfactory/index.html
index 6725fc906..e81b7a8f4 100644
--- a/demos/blockfactory/index.html
+++ b/demos/blockfactory/index.html
@@ -6,7 +6,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="target-densitydpi=device-dpi, height=660, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
   <title>Blockly Demo: Blockly Factory</title>
-  <script src="../../blockly_uncompressed.js"></script>
+  <script src="../../blockly_compressed.js"></script>
   <script src="../../javascript_compressed.js"></script>
   <script src="../../msg/js/en.js"></script>
   <script src="../../blocks_compressed.js"></script>