CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 02:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #945 (annotations) and an eslint issue (constant condition)

Browse Source
This commit is contained in:
Andrew n marshall
2017-02-22 23:15:39 -08:00
parent 3d08099950
commit 3db3cf551f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/block.js
View File

@@ -876,16 +876,15 @@ Blockly.Block.prototype.setDisabled = function(disabled) {
* @return {boolean} True if disabled.
*/
Blockly.Block.prototype.getInheritedDisabled = function() {
var block = this;
while (true) {
block = block.getSurroundParent();
if (!block) {
// Ran off the top.
return false;
} else if (block.disabled) {
var ancestor = this.getSurroundParent();
while (ancestor) {
if (ancestor.disabled) {
return true;
}
ancestor = ancestor.getSurroundParent();
}
// Ran off the top.
return false;
};
/**
@@ -1231,7 +1230,7 @@ Blockly.Block.newFieldImageFromJson_ = function(options) {
* Helper function to construct a FieldLabel from a JSON arg object,
* dereferencing any string table references.
* @param {!Object} options A JSON object with options (text, and class).
* @returns {!Blockly.FieldImage} The new image.
* @returns {!Blockly.FieldLabel} The new label.
* @private
*/
Blockly.Block.newFieldLabelFromJson_ = function(options) {
@@ -1244,7 +1243,7 @@ Blockly.Block.newFieldLabelFromJson_ = function(options) {
* dereferencing any string table references.
* @param {!Object} options A JSON object with options (text, class, and
* spellcheck).
* @returns {!Blockly.FieldImage} The new image.
* @returns {!Blockly.FieldTextInput} The new text input.
* @private
*/
Blockly.Block.newFieldTextInputFromJson_ = function(options) {
@@ -1260,7 +1259,7 @@ Blockly.Block.newFieldTextInputFromJson_ = function(options) {
* Helper function to construct a FieldVariable from a JSON arg object,
* dereferencing any string table references.
* @param {!Object} options A JSON object with options (variable).
* @returns {!Blockly.FieldImage} The new image.
* @returns {!Blockly.FieldVariable} The variable field.
* @private
*/
Blockly.Block.newFieldVariableFromJson_ = function(options) {