diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index fcb7569c26..7dbef1f20a 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -683,6 +683,7 @@ h1 .imageLink { z-index: 99997; color: #fff; border: 0 !important; + max-height: 200px; } .footerNotification { diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index a9003520ed..76573784f9 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -234,7 +234,7 @@ $("#videoBackdrop", footer).show(); - footer.css("height", "0"); + footer.css("top", "101%"); var videoPlayer = $("#videoPlayer", footer) //.hide() diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 4a2dc2a1e4..85ccf596a8 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -292,7 +292,7 @@ var Dashboard = { options.id = options.id || "notification" + new Date().getTime() + parseInt(Math.random()); - var footer = $("#footer"); + var footer = $("#footer").css("top", "initial").show(); var parentElem = $('#footerNotifications', footer); @@ -312,22 +312,6 @@ var Dashboard = { elem.slideDown(400); } - var videoBackdrop = $("#videoBackdrop"); - - var isPlaying = false; - - if (videoBackdrop.is(":visible")) { - - videoBackdrop.css("bottom", "48px"); - - isPlaying = true; - - } else { - - footer.show(); - - } - elem.html(options.html).trigger("create"); if (options.timeout) { @@ -344,16 +328,15 @@ var Dashboard = { } footer.on("notification.remove notification.hide", function (e) { + setTimeout(function () { // give the DOM time to catch up - if (parentElem.html() == "") { - if (!isPlaying) { - footer.slideUp(); - } else { - footer.css({ height: "0" }); - videoBackdrop.animate({ bottom: "0" }, 400); - } + + if (!parentElem.html()) { + footer.slideUp(); } + }, 50); + }); },