From 615c403b44c5b4d137c06025fc83e77272084748 Mon Sep 17 00:00:00 2001
From: Rachel Fenichel <fenichel@google.com>
Date: Thu, 1 Mar 2018 12:35:55 -0800
Subject: [PATCH] Use @nocompress annotation to fix advanced compilation.

---
 core/field_angle.js     | 1 +
 core/field_checkbox.js  | 1 +
 core/field_colour.js    | 1 +
 core/field_date.js      | 1 +
 core/field_dropdown.js  | 1 +
 core/field_image.js     | 1 +
 core/field_label.js     | 1 +
 core/field_number.js    | 1 +
 core/field_textinput.js | 1 +
 core/field_variable.js  | 3 ++-
 10 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/field_angle.js b/core/field_angle.js
index 104e746f5..a0549c0c3 100644
--- a/core/field_angle.js
+++ b/core/field_angle.js
@@ -58,6 +58,7 @@ goog.inherits(Blockly.FieldAngle, Blockly.FieldTextInput);
  * @param {!Object} options A JSON object with options (angle).
  * @returns {!Blockly.FieldAngle} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldAngle.fromJson = function(options) {
   return new Blockly.FieldAngle(options['angle']);
diff --git a/core/field_checkbox.js b/core/field_checkbox.js
index 2d3a3c4be..74930ec4a 100644
--- a/core/field_checkbox.js
+++ b/core/field_checkbox.js
@@ -51,6 +51,7 @@ goog.inherits(Blockly.FieldCheckbox, Blockly.Field);
  * @param {!Object} options A JSON object with options (checked).
  * @returns {!Blockly.FieldCheckbox} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldCheckbox.fromJson = function(options) {
   return new Blockly.FieldCheckbox(options['checked'] ? 'TRUE' : 'FALSE');
diff --git a/core/field_colour.js b/core/field_colour.js
index 4ba161a84..dfeee67d9 100644
--- a/core/field_colour.js
+++ b/core/field_colour.js
@@ -57,6 +57,7 @@ goog.inherits(Blockly.FieldColour, Blockly.Field);
  * @param {!Object} options A JSON object with options (colour).
  * @returns {!Blockly.FieldColour} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldColour.fromJson = function(options) {
   return new Blockly.FieldColour(options['colour']);
diff --git a/core/field_date.js b/core/field_date.js
index 662198107..6a5c5a434 100644
--- a/core/field_date.js
+++ b/core/field_date.js
@@ -64,6 +64,7 @@ goog.inherits(Blockly.FieldDate, Blockly.Field);
  * @param {!Object} options A JSON object with options (date).
  * @returns {!Blockly.FieldDate} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldDate.fromJson = function(options) {
   return new Blockly.FieldDate(options['date']);
diff --git a/core/field_dropdown.js b/core/field_dropdown.js
index 79fdbf76a..206161ed9 100644
--- a/core/field_dropdown.js
+++ b/core/field_dropdown.js
@@ -68,6 +68,7 @@ goog.inherits(Blockly.FieldDropdown, Blockly.Field);
  * @param {!Object} options A JSON object with options (options).
  * @returns {!Blockly.FieldDropdown} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldDropdown.fromJson = function(options) {
   return new Blockly.FieldDropdown(options['options']);
diff --git a/core/field_image.js b/core/field_image.js
index 18b832730..8389b039d 100644
--- a/core/field_image.js
+++ b/core/field_image.js
@@ -67,6 +67,7 @@ goog.inherits(Blockly.FieldImage, Blockly.Field);
  *                          alt).
  * @returns {!Blockly.FieldImage} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldImage.fromJson = function(options) {
   var src = Blockly.utils.replaceMessageReferences(options['src']);
diff --git a/core/field_label.js b/core/field_label.js
index 53a13e695..fe603e576 100644
--- a/core/field_label.js
+++ b/core/field_label.js
@@ -52,6 +52,7 @@ goog.inherits(Blockly.FieldLabel, Blockly.Field);
  * @param {!Object} options A JSON object with options (text, and class).
  * @returns {!Blockly.FieldLabel} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldLabel.fromJson = function(options) {
   var text = Blockly.utils.replaceMessageReferences(options['text']);
diff --git a/core/field_number.js b/core/field_number.js
index 9bc27cc5a..708e14940 100644
--- a/core/field_number.js
+++ b/core/field_number.js
@@ -59,6 +59,7 @@ goog.inherits(Blockly.FieldNumber, Blockly.FieldTextInput);
  *                          precision).
  * @returns {!Blockly.FieldNumber} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldNumber.fromJson = function(options) {
   return new Blockly.FieldNumber(options['value'],
diff --git a/core/field_textinput.js b/core/field_textinput.js
index db1c04bf5..62bae26c3 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -57,6 +57,7 @@ goog.inherits(Blockly.FieldTextInput, Blockly.Field);
  *                          spellcheck).
  * @returns {!Blockly.FieldTextInput} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldTextInput.fromJson = function(options) {
   var text = Blockly.utils.replaceMessageReferences(options['text']);
diff --git a/core/field_variable.js b/core/field_variable.js
index 7a3d6a37c..d27666e0d 100644
--- a/core/field_variable.js
+++ b/core/field_variable.js
@@ -68,6 +68,7 @@ goog.inherits(Blockly.FieldVariable, Blockly.FieldDropdown);
  *                          variableTypes, and defaultType).
  * @returns {!Blockly.FieldVariable} The new field instance.
  * @package
+ * @nocollapse
  */
 Blockly.FieldVariable.fromJson = function(options) {
   var varname = Blockly.utils.replaceMessageReferences(options['variable']);
@@ -120,7 +121,7 @@ Blockly.FieldVariable.prototype.initModel = function() {
  * Dispose of this field.
  * @public
  */
-Blockly.FieldVariable.dispose = function() {
+Blockly.FieldVariable.prototype.dispose = function() {
   Blockly.FieldVariable.superClass_.dispose.call(this);
   this.workspace_ = null;
   this.variableMap_ = null;