Add else on/off to while block

minjk-bl · minjk-bl · commit d0d91f05243a · 2022-01-21T13:13:34.000+09:00
diff --git a/js/MainFrame.js b/js/MainFrame.js
@@ -386,7 +386,7 @@ define([
                                 if (parentBlock == null) {
                                     parentBlock = newBlock; // set parent block of created block
                                 } else {
-                                    if (prevBlock != null && !newBlock.isGroup) {
+                                    if (!(blockState && blockState.depth != undefined) && prevBlock != null && !newBlock.isGroup) {
                                         let newDepth = prevBlock.getChildDepth();
                                         if (tmpState && tmpState.relativeDepth) {
                                             newDepth = parentBlock.getChildDepth() + tmpState.relativeDepth;
@@ -523,7 +523,6 @@ define([
 
                     ];
                     break;
-                    break;
                 case 'lgCtrl_for':
                 case 'lgCtrl_while':
                 case 'lgCtrl_if':
diff --git a/js/board/Block.js b/js/board/Block.js
@@ -164,7 +164,7 @@ define([
 
             // template for block button
             let { elseFlag, finallyFlag } = this.state; 
-            if (taskId == 'lgCtrl_for') {
+            if (taskId == 'lgCtrl_for' || taskId == 'lgCtrl_while') {
                 page.appendLine('<div class="vp-block-button-group">');
                 page.appendFormatLine('<div class="vp-block-button {0}" data-menu="{1}">{2}</div>', 'else', 'else', 'else ' + (elseFlag?'off':'on'));
                 page.appendLine('</div>');
