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 conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/components/paperdialoghelper.js
View file

@ -102,9 +102,9 @@
// but not needed here since this is already on top of an existing dialog
// but skip it in IE because it's causing the entire browser to hang
// Also have to disable for firefox because it's causing select elements to not be clickable
if (!browserInfo.msie && !browserInfo.mozilla) {
if (!browserInfo.msie && !browserInfo.firefox) {
if (options.modal !== false) {
dlg.setAttribute('modal', 'modal');
//dlg.setAttribute('modal', 'modal');
}
}