From 69df716ef53fad06251af84a6086e40412d0ca47 Mon Sep 17 00:00:00 2001
From: Tim Dawborn <tim.dawborn@gmail.com>
Date: Mon, 16 Jan 2017 08:48:11 +1100
Subject: [PATCH] Fixes as per code review on PR.

---
 core/block.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/block.js b/core/block.js
index 25f09ee14..48181f9d8 100644
--- a/core/block.js
+++ b/core/block.js
@@ -1344,11 +1344,15 @@ Blockly.Block.prototype.makeConnection_ = function(type) {
  * @return {boolean} True if all inputs are filled, false otherwise.
  */
 Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
-  // Handle the default value for the optional argument.
+  // Account for the shadow block filledness toggle.
   if (opt_shadowBlocksAreFilled === undefined) {
     opt_shadowBlocksAreFilled = true;
   }
+  if (!opt_shadowBlocksAreFilled && this.isShadow()) {
+    return false;
+  }
 
+  // Recursively check each input block of the current block.
   for (var i = 0, input; input = this.inputList[i]; i++) {
     if (!input.connection) {
       continue;
@@ -1357,11 +1361,9 @@ Blockly.Block.prototype.allInputsFilled = function(opt_shadowBlocksAreFilled) {
     if (!target || !target.allInputsFilled(opt_shadowBlocksAreFilled)) {
       return false;
     }
-    if (!opt_shadowBlocksAreFilled && target.isShadow()) {
-      return false;
-    }
   }
 
+  // Recursively check the next block after the current block.
   var next = this.getNextBlock();
   if (next) {
     return next.allInputsFilled(opt_shadowBlocksAreFilled);