From 90d924b84a1b1005b9b1df957c903bdbaac5033e Mon Sep 17 00:00:00 2001 From: Chris Johnson Date: Thu, 29 Sep 2016 00:37:21 -0500 Subject: [PATCH] Adds default def comment only if comments enabled. --- blocks/procedures.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/blocks/procedures.js b/blocks/procedures.js index 19a5f6e68..735770aea 100644 --- a/blocks/procedures.js +++ b/blocks/procedures.js @@ -49,7 +49,9 @@ Blockly.Blocks['procedures_defnoreturn'] = { .appendField(nameField, 'NAME') .appendField('', 'PARAMS'); this.setMutator(new Blockly.Mutator(['procedures_mutatorarg'])); - if (Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT) { + if ((this.workspace.options.comments || + (this.workspace.options.parentWorkspace && this.workspace.options.parentWorkspace.options.comments)) && + Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT) { this.setCommentText(Blockly.Msg.PROCEDURES_DEFNORETURN_COMMENT); } this.setColour(Blockly.Blocks.procedures.HUE); @@ -343,7 +345,9 @@ Blockly.Blocks['procedures_defreturn'] = { .setAlign(Blockly.ALIGN_RIGHT) .appendField(Blockly.Msg.PROCEDURES_DEFRETURN_RETURN); this.setMutator(new Blockly.Mutator(['procedures_mutatorarg'])); - if (Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT) { + if ((this.workspace.options.comments || + (this.workspace.options.parentWorkspace && this.workspace.options.parentWorkspace.options.comments)) && + Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT) { this.setCommentText(Blockly.Msg.PROCEDURES_DEFRETURN_COMMENT); } this.setColour(Blockly.Blocks.procedures.HUE);