Merge pull request #172 from alajillo/oss22_logic

minjk-bl · web-flow · commit 0d04ff060edd · 2022-08-28T16:48:38.000+09:00
Fixed #150 - insert block from main frame, apply placeholder depth
diff --git a/js/board/BoardFrame.js b/js/board/BoardFrame.js
@@ -61,6 +61,7 @@ define([
                 vp_note_display: true,
                 viewDepthNumber: false,
                 indentCount: 4,
+                currentParentBlock : null,
                 ...this.state
             };
 
@@ -759,6 +760,10 @@ define([
                 // add to specific position
                 this.blockList.splice(position, 0, block);
             }
+            if(this.currentParentBlock){
+                this.moveBlock(position, position, this.currentParentBlock);
+                this.currentParentBlock = null;
+            }
             return block;
         }
 
@@ -807,6 +812,8 @@ define([
                     movingBlock.setGroupBlock();
                 }
                 this.reloadBlockList();
+            }else if(parentBlock){
+                this.currentParentBlock = parentBlock
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ define([`
`61`	`61`	`vp_note_display: true,`
`62`	`62`	`viewDepthNumber: false,`
`63`	`63`	`indentCount: 4,`
	`64`	`+ currentParentBlock : null,`
`64`	`65`	`...this.state`
`65`	`66`	`};`
`66`	`67`
`@@ -759,6 +760,10 @@ define([`
`759`	`760`	`// add to specific position`
`760`	`761`	`this.blockList.splice(position, 0, block);`
`761`	`762`	`}`
	`763`	`+ if(this.currentParentBlock){`
	`764`	`+ this.moveBlock(position, position, this.currentParentBlock);`
	`765`	`+ this.currentParentBlock = null;`
	`766`	`+ }`
`762`	`767`	`return block;`
`763`	`768`	`}`
`764`	`769`
`@@ -807,6 +812,8 @@ define([`
`807`	`812`	`movingBlock.setGroupBlock();`
`808`	`813`	`}`
`809`	`814`	`this.reloadBlockList();`
	`815`	`+ }else if(parentBlock){`
	`816`	`+ this.currentParentBlock = parentBlock`
`810`	`817`	`}`
`811`	`818`	`}`
`812`	`819`