diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 7adf4dc436..6ffe0723b7 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1363,10 +1363,6 @@ atts.push('data-locationtype="' + (item.LocationType || '') + '"'); atts.push('data-index="' + index + '"'); - if (options.showDetailsMenu) { - atts.push('data-detailsmenu="true"'); - } - if (item.AlbumId) { atts.push('data-albumid="' + item.AlbumId + '"'); } @@ -2679,13 +2675,21 @@ showSortMenu: function (options) { - var id = 'dlg' + new Date().getTime(); - var html = ''; + var dlg = document.createElement('paper-dialog'); - html += ''; + dlg.setAttribute('with-backdrop', 'with-backdrop'); + dlg.setAttribute('role', 'alertdialog'); + // without this safari will scroll the background instead of the dialog contents + + dlg.entryAnimation = 'scale-up-animation'; + dlg.exitAnimation = 'fade-out-animation'; + + var html = ''; // There seems to be a bug with this in safari causing it to immediately roll up to 0 height var isScrollable = !$.browser.safari; + // Have to disable this right now because it's causing the radio buttons to not function properly in other browsers besides chrome + isScrollable = false; html += '

'; html += Globalize.translate('HeaderSortBy'); @@ -2720,40 +2724,36 @@ html += '' + Globalize.translate('ButtonClose') + ''; html += ''; - html += ''; + dlg.innerHTML = html; + document.body.appendChild(dlg); - $(document.body).append(html); + $(dlg).on('iron-overlay-closed', function () { + $(this).remove(); + }); - setTimeout(function () { - var dlg = document.getElementById(id); + require(['components/paperdialoghelper'], function () { - dlg.open(); + PaperDialogHelper.openWithHash(dlg, 'sortmenu'); + }); - $(dlg).on('iron-overlay-closed', function () { - $(this).remove(); - }); + $('.groupSortBy', dlg).on('iron-select', function () { + options.query.SortBy = this.selected.replace('_', ','); + options.query.StartIndex = 0; - $('.groupSortBy', dlg).on('iron-select', function () { - options.query.SortBy = this.selected.replace('_', ','); - options.query.StartIndex = 0; + if (options.callback) { + options.callback(); + } + }); - if (options.callback) { - options.callback(); - } - }); + $('.groupSortOrder', dlg).on('iron-select', function () { - $('.groupSortOrder', dlg).on('iron-select', function () { - - options.query.SortOrder = this.selected; - options.query.StartIndex = 0; - - if (options.callback) { - options.callback(); - } - }); - - }, 100); + options.query.SortOrder = this.selected; + options.query.StartIndex = 0; + if (options.callback) { + options.callback(); + } + }); }, getRatingHtml: function (item, metascore) { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 327ebc4b4c..243ad14add 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -793,7 +793,7 @@ contentHtml += '' + Globalize.translate('ButtonPlay') + ''; } - contentHtml += '' + Globalize.translate('ButtonOpen') + ''; + contentHtml += '' + Globalize.translate('ButtonOpen') + ''; if (SyncManager.isAvailable(item, user)) { contentHtml += '' + Globalize.translate('ButtonSync') + ''; diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 2ef1463287..aff1c9b2b5 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -211,8 +211,13 @@ paper-button.notext { paper-dialog { border-radius: 4px; z-index: 999999 !important; + font-family: inherit !important; } + paper-dialog h2 { + font-family: inherit !important; + } + iron-overlay-backdrop { z-index: 999998 !important; }