Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3496 : PlaylistBuilder, NowPlaying -> GUI representation gets broken while being resized

This commit is contained in:
Naomi Aro 2012-03-30 16:33:43 +02:00
parent 6ddc8288be
commit 2ab6ea98a6
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/public/js/airtime/library/spl.js
View File

@ -744,7 +744,12 @@ var AIRTIME = (function(AIRTIME){
widgetHeight = viewport.height - 185; widgetHeight = viewport.height - 185;
width = Math.floor(viewport.width - 110); width = Math.floor(viewport.width - 110);
var libTableHeight = widgetHeight - 130;
$lib.height(widgetHeight) $lib.height(widgetHeight)
.find(".dataTables_scrolling")
.css("max-height", libTableHeight)
.end()
.width(Math.floor(width * 0.55)); .width(Math.floor(width * 0.55));
$pl.height(widgetHeight) $pl.height(widgetHeight)

16
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View File

@ -45,13 +45,23 @@ AIRTIME = (function(AIRTIME) {
widgetHeight = viewport.height - 180; widgetHeight = viewport.height - 180;
screenWidth = Math.floor(viewport.width - 120); screenWidth = Math.floor(viewport.width - 120);
var libTableHeight = widgetHeight - 130,
builderTableHeight = widgetHeight - 95;
//set the heights of the main widgets. //set the heights of the main widgets.
$lib.height(widgetHeight); $builder.height(widgetHeight)
$builder.height(widgetHeight); .find(".dataTables_scrolling")
.css("max-height", builderTableHeight)
.end()
.width(screenWidth);
if ($lib.filter(':visible').length > 0) { if ($lib.filter(':visible').length > 0) {
$lib.width(Math.floor(screenWidth * 0.5)); $lib.width(Math.floor(screenWidth * 0.5))
.height(widgetHeight)
.find(".dataTables_scrolling")
.css("max-height", libTableHeight)
.end();
$builder.width(Math.floor(screenWidth * 0.5)) $builder.width(Math.floor(screenWidth * 0.5))
.find("#sb_edit") .find("#sb_edit")