mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Fix for stacking notifications

Browse source 
Video player just plays over the top
Max-height set on footer to display 3 stacked messages
This commit is contained in:
Tim Hobbs 2014-03-17 20:41:42 -07:00
parent d8ba16da08
commit b5b21349f9
3 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dashboard-ui/css/site.css
View file

@ -683,6 +683,7 @@ h1 .imageLink {
z-index: 99997; z-index: 99997;
color: #fff; color: #fff;
border: 0 !important; border: 0 !important;
max-height: 200px;
} }
.footerNotification { .footerNotification {

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -234,7 +234,7 @@
$("#videoBackdrop", footer).show(); $("#videoBackdrop", footer).show();
footer.css("height", "0"); footer.css("top", "101%");
var videoPlayer = $("#videoPlayer", footer) var videoPlayer = $("#videoPlayer", footer)
//.hide() //.hide()

29
dashboard-ui/scripts/site.js
View file

@ -292,7 +292,7 @@ var Dashboard = {
options.id = options.id || "notification" + new Date().getTime() + parseInt(Math.random()); 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); var parentElem = $('#footerNotifications', footer);
@ -312,22 +312,6 @@ var Dashboard = {
elem.slideDown(400); 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"); elem.html(options.html).trigger("create");
if (options.timeout) { if (options.timeout) {
@ -344,16 +328,15 @@ var Dashboard = {
} }
footer.on("notification.remove notification.hide", function (e) { footer.on("notification.remove notification.hide", function (e) {
setTimeout(function () { // give the DOM time to catch up setTimeout(function () { // give the DOM time to catch up
if (parentElem.html() == "") {
if (!isPlaying) { if (!parentElem.html()) {
footer.slideUp(); footer.slideUp();
} else {
footer.css({ height: "0" });
videoBackdrop.animate({ bottom: "0" }, 400);
}
} }
}, 50); }, 50);
}); });
}, },