Skip to content

Commit 3054569

Browse files
authored
Merge pull request #1510 from adumesny/develop
nested.html using jq version
2 parents 57c3762 + 70ae16d commit 3054569

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

demo/nested.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77
<title>Nested grids demo (ES6)</title>
88
<link rel="stylesheet" href="demo.css"/>
9-
<script src="../dist/gridstack-h5.js"></script>
9+
<script src="../dist/gridstack-jq.js"></script>
1010
<style type="text/css">
1111
.grid-stack .grid-stack {
1212
background: rgba(255, 255, 255, 0.3);
@@ -20,7 +20,7 @@
2020
<div class="container-fluid">
2121
<h1>Nested grids demo</h1>
2222
<p>This example uses new v3.1 API to load the entire nested grid from JSON, and shows dragging between nested grid items (pink) vs dragging higher grid items (green)</p>
23-
<!-- <p>Note: initial v3.0.0 HTML5 release doesn't support 'dragOut:false' constrain (always true) so this uses JQ version for now.</p> -->
23+
<p>Note: initial v3.0.0 HTML5 release doesn't support 'dragOut:false' constrain so this uses JQ version for now. If you don't need the nested2 behavior I suggest you use h5 version.</p>
2424
<a class="btn btn-primary" onClick="addNewWidget('.nested1')" href="#">Add Widget Grid1</a>
2525
<a class="btn btn-primary" onClick="addNewWidget('.nested2')" href="#">Add Widget Grid2</a>
2626
<br><br>
@@ -41,7 +41,7 @@ <h1>Nested grids demo</h1>
4141
let layout = {cellHeight: 70, children: [
4242
{w:1, content: 'regular item'},
4343
{x:1, w:4, h:4, content: 'nested 1 - can drag items out', subGrid: {children: sub1, dragOut: true, class: 'nested1', ...subOptions}},
44-
{x:5, w:4, h:4, content: 'nested 2 - constrained to parent (default)', subGrid: {children: sub2, dragOut: false, class: 'nested2', ...subOptions}},
44+
{x:5, w:4, h:4, content: 'nested 2 - constrained to parent (default)', subGrid: {children: sub2, class: 'nested2', ...subOptions}},
4545
]};
4646

4747
// create and load it all from JSON above

0 commit comments

Comments
 (0)