mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix merge conflict
This commit is contained in:
parent
ae606a3e3e
commit
ddee3d610a
1 changed files with 4 additions and 4 deletions
|
@ -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 () {
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue