Commit0d04ff0

authored

Merge pull request#172 from alajillo/oss22_logic

Fixed#150 - insert block from main frame, apply placeholder depth

2 parentsffd95be +3beaf5d commit0d04ff0Copy full SHA for 0d04ff0

File tree

-0

lines changed

-0

lines changed

Lines changed: 7 additions & 0 deletions

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`	`returnblock;`
`763`	`768`	`}`
`764`	`769`
`@@ -807,6 +812,8 @@ define([`
`807`	`812`	`movingBlock.setGroupBlock();`
`808`	`813`	`}`
`809`	`814`	`this.reloadBlockList();`
	`815`	`+}elseif(parentBlock){`
	`816`	`+this.currentParentBlock=parentBlock`
`810`	`817`	`}`
`811`	`818`	`}`
`812`	`819`

Comments

(0)