CAMP/padmaEssay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some tweaking of annotation text height

Browse Source
This commit is contained in:
sanj 2010-11-23 22:37:40 +01:00
parent 59ab7ffcfb
commit 1833914788
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
padma.layers.js
View File

@ -1,10 +1,10 @@
var padmaConfig = { var padmaConfig = {
'background': 'rgba(0,0,0,0.85)', 'background': 'rgba(0,0,0,0.85)',
'color': '#fff', 'color': '#fff',
'links_url': 'http://padma.okno.be/', // 'links_url': 'http://padma.okno.be/',
'data_url': 'http://padma.okno.be/', // 'data_url': 'http://padma.okno.be/',
// 'links_url': 'http://pad.ma/', 'links_url': 'http://pad.ma/',
// 'data_url': 'http://pad.ma/', 'data_url': 'http://pad.ma/',
'default_layers': ['transcript', 'description'], 'default_layers': ['transcript', 'description'],
}; };

2
test.html
View File

@ -8,7 +8,7 @@
<script type="text/javascript" src="jquery.tooltip.js"></script> <script type="text/javascript" src="jquery.tooltip.js"></script>
<script type="text/javascript" src="padma.layers.js"></script> <script type="text/javascript" src="padma.layers.js"></script>
<script type="text/javascript" src="padma.links.js"></script> <script type="text/javascript" src="padma.links.js"></script>
<script type="text/javascript" src="testOkno.js"></script> <script type="text/javascript" src="test.js"></script>
<script type="text/javascript" src="utils.js"></script> <script type="text/javascript" src="utils.js"></script>
</head> </head>
<body> <body>

2
test.js
View File

@ -76,7 +76,7 @@ var $padmaQuery = jQuery.noConflict();
padmaContainer.empty(); padmaContainer.empty();
var sidebarWrap = $('<div />').attr("id", "padmaSidebarWrapper").css({'position': 'relative'}).appendTo($container); var sidebarWrap = $('<div />').attr("id", "padmaSidebarWrapper").css({'position': 'relative'}).appendTo($container);
var videoElem = $('<video />').addClass('padmaVideo').attr("src", videoObj.getLayerVideo(linkData.tcIn, linkData.tcOut)).attr("autoplay", "autoplay").attr("controls", "controls").appendTo(sidebarWrap).css({'width': '400px'}); var videoElem = $('<video />').addClass('padmaVideo').attr("src", videoObj.getLayerVideo(linkData.tcIn, linkData.tcOut)).attr("autoplay", "autoplay").attr("controls", "controls").appendTo(sidebarWrap).css({'width': '400px'});
var annotHeight = $(document).height() - 300; var annotHeight = $(document).height() - parseInt((videoObj.video.height / videoObj.stream_width) * 400) - 20;
var annotations = $('<div />').addClass('annotationText').css({'height': annotHeight + "px", "overflow-y": "auto"}).appendTo(sidebarWrap); var annotations = $('<div />').addClass('annotationText').css({'height': annotHeight + "px", "overflow-y": "auto"}).appendTo(sidebarWrap);
var html = getLayersHtml(npt2ms(linkData.tcIn), p.default_layers); var html = getLayersHtml(npt2ms(linkData.tcIn), p.default_layers);
$('.annotationText').html(html); $('.annotationText').html(html);