From 2308ae8c22181804f63a85193e318962ebe97fe3 Mon Sep 17 00:00:00 2001 From: Mark Gibson Date: Wed, 7 Feb 2018 18:18:35 +0000 Subject: [PATCH] Remove underscore from fromJson_ --- core/block.js | 20 ++++++++++---------- core/field_angle.js | 2 +- core/field_checkbox.js | 2 +- core/field_colour.js | 2 +- core/field_date.js | 2 +- core/field_dropdown.js | 2 +- core/field_image.js | 2 +- core/field_label.js | 2 +- core/field_number.js | 2 +- core/field_textinput.js | 2 +- core/field_variable.js | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/core/block.js b/core/block.js index 61e83291f..7558ce1e4 100644 --- a/core/block.js +++ b/core/block.js @@ -1224,35 +1224,35 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign) { input = this.appendDummyInput(element['name']); break; case 'field_label': - field = Blockly.FieldLabel.fromJson_(element); + field = Blockly.FieldLabel.fromJson(element); break; case 'field_input': - field = Blockly.FieldTextInput.fromJson_(element); + field = Blockly.FieldTextInput.fromJson(element); break; case 'field_angle': - field = Blockly.FieldAngle.fromJson_(element); + field = Blockly.FieldAngle.fromJson(element); break; case 'field_checkbox': - field = Blockly.FieldCheckbox.fromJson_(element); + field = Blockly.FieldCheckbox.fromJson(element); break; case 'field_colour': - field = Blockly.FieldColour.fromJson_(element); + field = Blockly.FieldColour.fromJson(element); break; case 'field_variable': - field = Blockly.FieldVariable.fromJson_(element); + field = Blockly.FieldVariable.fromJson(element); break; case 'field_dropdown': - field = Blockly.FieldDropdown.fromJson_(element); + field = Blockly.FieldDropdown.fromJson(element); break; case 'field_image': - field = Blockly.FieldImage.fromJson_(element); + field = Blockly.FieldImage.fromJson(element); break; case 'field_number': - field = Blockly.FieldNumber.fromJson_(element); + field = Blockly.FieldNumber.fromJson(element); break; case 'field_date': if (Blockly.FieldDate) { - field = Blockly.FieldDate.fromJson_(element); + field = Blockly.FieldDate.fromJson(element); break; } // Fall through if FieldDate is not compiled in. diff --git a/core/field_angle.js b/core/field_angle.js index 56f940042..59384d08b 100644 --- a/core/field_angle.js +++ b/core/field_angle.js @@ -59,7 +59,7 @@ goog.inherits(Blockly.FieldAngle, Blockly.FieldTextInput); * @returns {!Blockly.FieldAngle} The new field instance. * @package */ -Blockly.FieldAngle.fromJson_ = function(options) { +Blockly.FieldAngle.fromJson = function(options) { return new Blockly.FieldAngle(options['angle']); }; diff --git a/core/field_checkbox.js b/core/field_checkbox.js index 04850c54f..d723bab1f 100644 --- a/core/field_checkbox.js +++ b/core/field_checkbox.js @@ -52,7 +52,7 @@ goog.inherits(Blockly.FieldCheckbox, Blockly.Field); * @returns {!Blockly.FieldCheckbox} The new field instance. * @package */ -Blockly.FieldCheckbox.fromJson_ = function(options) { +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 f5275682d..77632c184 100644 --- a/core/field_colour.js +++ b/core/field_colour.js @@ -58,7 +58,7 @@ goog.inherits(Blockly.FieldColour, Blockly.Field); * @returns {!Blockly.FieldColour} The new field instance. * @package */ -Blockly.FieldColour.fromJson_ = function(options) { +Blockly.FieldColour.fromJson = function(options) { return new Blockly.FieldColour(options['colour']); }; diff --git a/core/field_date.js b/core/field_date.js index f44646384..53ced0e14 100644 --- a/core/field_date.js +++ b/core/field_date.js @@ -65,7 +65,7 @@ goog.inherits(Blockly.FieldDate, Blockly.Field); * @returns {!Blockly.FieldDate} The new field instance. * @package */ -Blockly.FieldDate.fromJson_ = function(options) { +Blockly.FieldDate.fromJson = function(options) { return new Blockly.FieldDate(options['date']); }; diff --git a/core/field_dropdown.js b/core/field_dropdown.js index 26dfa91a2..367e338b7 100644 --- a/core/field_dropdown.js +++ b/core/field_dropdown.js @@ -69,7 +69,7 @@ goog.inherits(Blockly.FieldDropdown, Blockly.Field); * @returns {!Blockly.FieldDropdown} The new field instance. * @package */ -Blockly.FieldDropdown.fromJson_ = function(options) { +Blockly.FieldDropdown.fromJson = function(options) { return new Blockly.FieldDropdown(options['options']); }; diff --git a/core/field_image.js b/core/field_image.js index 920b91ef6..eaa8e9995 100644 --- a/core/field_image.js +++ b/core/field_image.js @@ -68,7 +68,7 @@ goog.inherits(Blockly.FieldImage, Blockly.Field); * @returns {!Blockly.FieldImage} The new field instance. * @package */ -Blockly.FieldImage.fromJson_ = function(options) { +Blockly.FieldImage.fromJson = function(options) { var src = Blockly.utils.replaceMessageReferences(options['src']); var width = Number(Blockly.utils.replaceMessageReferences(options['width'])); var height = diff --git a/core/field_label.js b/core/field_label.js index a9730356a..039f73a75 100644 --- a/core/field_label.js +++ b/core/field_label.js @@ -53,7 +53,7 @@ goog.inherits(Blockly.FieldLabel, Blockly.Field); * @returns {!Blockly.FieldLabel} The new field instance. * @package */ -Blockly.FieldLabel.fromJson_ = function(options) { +Blockly.FieldLabel.fromJson = function(options) { var text = Blockly.utils.replaceMessageReferences(options['text']); return new Blockly.FieldLabel(text, options['class']); }; diff --git a/core/field_number.js b/core/field_number.js index 8a6e2537d..ca90d4d2c 100644 --- a/core/field_number.js +++ b/core/field_number.js @@ -60,7 +60,7 @@ goog.inherits(Blockly.FieldNumber, Blockly.FieldTextInput); * @returns {!Blockly.FieldNumber} The new field instance. * @package */ -Blockly.FieldNumber.fromJson_ = function(options) { +Blockly.FieldNumber.fromJson = function(options) { return new Blockly.FieldNumber(options['value'], options['min'], options['max'], options['precision']); }; diff --git a/core/field_textinput.js b/core/field_textinput.js index b570a6ff0..a8490ab18 100644 --- a/core/field_textinput.js +++ b/core/field_textinput.js @@ -58,7 +58,7 @@ goog.inherits(Blockly.FieldTextInput, Blockly.Field); * @returns {!Blockly.FieldTextInput} The new field instance. * @package */ -Blockly.FieldTextInput.fromJson_ = function(options) { +Blockly.FieldTextInput.fromJson = function(options) { var text = Blockly.utils.replaceMessageReferences(options['text']); var field = new Blockly.FieldTextInput(text, options['class']); if (typeof options['spellcheck'] === 'boolean') { diff --git a/core/field_variable.js b/core/field_variable.js index 0e70b6f75..333fee2d6 100644 --- a/core/field_variable.js +++ b/core/field_variable.js @@ -69,7 +69,7 @@ goog.inherits(Blockly.FieldVariable, Blockly.FieldDropdown); * @returns {!Blockly.FieldVariable} The new field instance. * @package */ -Blockly.FieldVariable.fromJson_ = function(options) { +Blockly.FieldVariable.fromJson = function(options) { var varname = Blockly.utils.replaceMessageReferences(options['variable']); var variableTypes = options['variableTypes']; var defaultType = options['defaultType'];