sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

merging changes

Browse source
This commit is contained in:
rlx 2011-03-04 03:50:37 +00:00
commit ee027fb760
3 changed files with 59 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

20
demos/splitpanel2/index.html
View file

@ -6,6 +6,7 @@
<link rel="stylesheet" type="text/css" href="../../build/css/ox.ui.css"/>
<script type="text/javascript" src="../../build/js/jquery-1.5.js"></script>
<script type="text/javascript" src="../../build/js/ox.js"></script>
<script type="text/javascript" src="../../build/js/ox.map.js"></script>
<script type="text/javascript" src="../../build/js/ox.ui.js"></script>
<script>
$(function() {
@ -42,7 +43,7 @@
element: Ox.Element()
.css({backgroundColor: 'rgb(128, 128, 255)'})
.html('{collapsible: true, size: "10%"}'),
size: '10%'
size: 24
},
{
element: five = new Ox.SplitPanel_({
@ -66,19 +67,18 @@
})
},
{
element: Ox.Element()
.css({backgroundColor: 'rgb(255, 160, 255)'})
element: new Ox.TreeList({
data: Ox.COUNTRIES
})
},
{
element: Ox.Element()
.css({
//position: 'absolute',
top: 16,
bottom: 16,
//display: 'block',
//top: 15,
//bottom: 0,
//height: '100%',
//height: '200px',
overflowY: 'scroll'
})
.append(
@ -97,7 +97,7 @@
collapsible: true,
element: Ox.Element()
.css({backgroundColor: 'rgb(255, 128, 128)'}),
size: '10%'
size: 24
}
],
orientation: 'vertical'
@ -107,10 +107,8 @@
collapsible: true,
element: new Ox.Element()
.css({backgroundColor: 'rgb(255, 255, 0)'})
.html('foo'/*'{collapsible: true, size: "10%", resizable: true, resize: ["5%", "10%", "15%"]}'*/),
size: '10%',
resizable: true,
resize: ['5%', '10%', '15%']
.html('{collapsible: true, size: "10%", resizable: true, resize: ["5%", "10%", "15%"]}'),
size: 256
}
],
orientation: 'horizontal'