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 merge conflict

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-23 12:54:10 -05:00
parent ae606a3e3e
commit ddee3d610a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/scripts/nowplayingbar.js
View file

@ -91,10 +91,10 @@
elem.classList.add('hide');
};
if (!browserInfo.animate || browserInfo.mobile) {
//if (!browserInfo.animate || browserInfo.mobile) {
onfinish();
return;
}
//}
requestAnimationFrame(function () {
var keyframes = [
@ -113,9 +113,9 @@
elem.classList.remove('hide');
if (!browserInfo.animate || browserInfo.mobile) {
//if (!browserInfo.animate || browserInfo.mobile) {
return;
}
//}
requestAnimationFrame(function () {