bottom-window-group 高度修改

This commit is contained in:
Van 2014-12-01 17:15:54 +08:00
parent b96423c772
commit 6efeb4b9d0
2 changed files with 8 additions and 3 deletions

View File

@ -372,7 +372,12 @@ var wide = {
$(".content").height(mainH).css("position", "relative");
$(".side .tabs-panel").height(mainH - 20);
$(".bottom-window-group > .tabs-panel > div > div").height(bottomH - 20);
var $bottomGroup = $(".bottom-window-group");
if ($bottomGroup.hasClass("bottom-window-group-max")) {
$(".bottom-window-group > .tabs-panel > div > div").height(mainH - $bottomGroup.children(".tabs").height());
} else {
$(".bottom-window-group > .tabs-panel > div > div").height(bottomH - $bottomGroup.children(".tabs").height());
}
},
_initWS: function () {
var outputWS = new ReconnectingWebSocket(config.channel.output + '/output/ws?sid=' + config.wideSessionId);

View File

@ -95,7 +95,7 @@ var windows = {
$it.attr("style", "");
var bottomH = $(".content").height();
$(".bottom-window-group > .tabs-panel > div > div").height(bottomH - 20);
$(".bottom-window-group > .tabs-panel > div > div").height(bottomH - $it.children(".tabs").height());
$it.addClass("bottom-window-group-max");
}
@ -113,7 +113,7 @@ var windows = {
$it.removeClass("bottom-window-group-max").attr("style", "");
var bottomH = $it.height();
$(".bottom-window-group > .tabs-panel > div > div").height(bottomH - 20);
$(".bottom-window-group > .tabs-panel > div > div").height(bottomH - $it.children(".tabs").height());
$it.animate({
"top": "70%"