From e0909b4ef8e72f5253a1c10921f315d3e64e2795 Mon Sep 17 00:00:00 2001
From: Beka Westberg <bekawestberg@gmail.com>
Date: Mon, 10 Jun 2019 10:42:58 -0700
Subject: [PATCH] Fixed fields still being editable on non-editable blocks.

---
 core/field.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/field.js b/core/field.js
index 8d9d54b01..9ea9bda61 100644
--- a/core/field.js
+++ b/core/field.js
@@ -369,7 +369,8 @@ Blockly.Field.prototype.updateEditable = function() {
  * @return {boolean} Whether this field is clickable.
  */
 Blockly.Field.prototype.isClickable = function() {
-  return !!this.showEditor_ && (typeof this.showEditor_ === 'function');
+  return !!this.sourceBlock_ && this.sourceBlock_.isEditable() &&
+      !!this.showEditor_ && (typeof this.showEditor_ === 'function');
 };
 
 /**