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-19 23:36:16 -05:00
parent 251d77ad9e
commit 2da0e19d81
5 changed files with 396 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
dashboard-ui/scripts/actionsheet.js
View file

@ -49,9 +49,9 @@
}
if (options.title) {
html += '<h2>';
html += '<h3>';
html += options.title;
html += '</h2>';
html += '</h3>';
}
// There seems to be a bug with this in safari causing it to immediately roll up to 0 height
@ -61,12 +61,15 @@
html += '<paper-dialog-scrollable>';
}
// If any items have an icon, give them all an icon just to make sure they're all lined up evenly
var renderIcon = options.items.filter(function (o) {
var itemsWithIcons = options.items.filter(function(o) {
return o.ironIcon;
}).length;
});
if (options.title && !renderIcon) {
// If any items have an icon, give them all an icon just to make sure they're all lined up evenly
var renderIcon = itemsWithIcons.length;
var center = options.title && (!itemsWithIcons.length || itemsWithIcons.length != options.items.length);
if (center) {
html += '<paper-menu style="text-align:center;">';
} else {
html += '<paper-menu>';
@ -78,9 +81,13 @@
html += '<paper-menu-item class="actionSheetMenuItem" data-id="' + option.id + '" style="display:block;">';
if (option.ironIcon) {
html += '<iron-icon icon="' + option.ironIcon + '"></iron-icon>';
if (center) {
html += '<iron-icon style="margin-right:.5em;" icon="' + option.ironIcon + '"></iron-icon>';
} else {
html += '<iron-icon icon="' + option.ironIcon + '"></iron-icon>';
}
}
else if (renderIcon) {
else if (renderIcon && !center) {
html += '<iron-icon></iron-icon>';
}
html += '<span>' + option.name + '</span>';