diff --git a/dashboard-ui/components/itemidentifier/itemidentifier.js b/dashboard-ui/components/itemidentifier/itemidentifier.js index d6282cf5b3..f6e96ce13c 100644 --- a/dashboard-ui/components/itemidentifier/itemidentifier.js +++ b/dashboard-ui/components/itemidentifier/itemidentifier.js @@ -32,7 +32,7 @@ var hasId = false; var txtLookupId = page.querySelectorAll('.txtLookupId'); - for (i = 0, length = identifyField.length; i < length; i++) { + for (i = 0, length = txtLookupId.length; i < length; i++) { var value = txtLookupId[i].value; diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 12afdf8197..0e0a3237fe 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -145,7 +145,7 @@

${HeaderScenes} - +

diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 24850122e2..c10da498c2 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -468,7 +468,7 @@ }); } var itemGenres = page.querySelectorAll('.itemGenres'); - for (i = 0, length = itemMiscInfo.length; i < length; i++) { + for (i = 0, length = itemGenres.length; i < length; i++) { LibraryBrowser.renderGenres(itemGenres[i], item, null, isStatic); } @@ -712,6 +712,10 @@ var similarCollapsible = page.querySelector('#similarCollapsible'); + if (!similarCollapsible) { + return; + } + if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "Series" || item.Type == "Program" || item.Type == "Recording" || item.Type == "Game" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "ChannelVideoItem") { similarCollapsible.classList.remove('hide'); } @@ -2111,7 +2115,9 @@ Dashboard.getCurrentUser().then(function (user) { - LibraryBrowser.showMoreCommands(button, currentItem.Id, currentItem.Type, LibraryBrowser.getMoreCommands(currentItem, user)); + LibraryBrowser.showMoreCommands(button, currentItem.Id, currentItem.Type, LibraryBrowser.getMoreCommands(currentItem, user)).then(function() { + reload(view, params); + }); }); } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 3ca483eca4..aa71b923bd 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -889,93 +889,96 @@ }); } - var serverId = ApiClient.serverInfo().Id; + return new Promise(function (resolve, reject) { - require(['actionsheet'], function (actionsheet) { + var serverId = ApiClient.serverInfo().Id; - actionsheet.show({ - items: items, - positionTo: positionTo, - callback: function (id) { + require(['actionsheet'], function (actionsheet) { - switch (id) { + actionsheet.show({ + items: items, + positionTo: positionTo, + callback: function (id) { - case 'share': - require(['sharingmanager'], function (sharingManager) { - sharingManager.showMenu({ - serverId: serverId, - itemId: itemId + switch (id) { + + case 'share': + require(['sharingmanager'], function (sharingManager) { + sharingManager.showMenu({ + serverId: serverId, + itemId: itemId + }); }); - }); - break; - case 'addtocollection': - require(['collectionEditor'], function (collectionEditor) { + break; + case 'addtocollection': + require(['collectionEditor'], function (collectionEditor) { - new collectionEditor().show({ - items: [itemId], - serverId: serverId + new collectionEditor().show({ + items: [itemId], + serverId: serverId + }); }); - }); - break; - case 'playlist': - require(['playlistEditor'], function (playlistEditor) { - new playlistEditor().show({ - items: [itemId], - serverId: serverId + break; + case 'playlist': + require(['playlistEditor'], function (playlistEditor) { + new playlistEditor().show({ + items: [itemId], + serverId: serverId + }); }); - }); - break; - case 'delete': - LibraryBrowser.deleteItems([itemId]); - break; - case 'download': - { - require(['fileDownloader'], function (fileDownloader) { + break; + case 'delete': + LibraryBrowser.deleteItems([itemId]); + break; + case 'download': + { + require(['fileDownloader'], function (fileDownloader) { - var downloadHref = ApiClient.getUrl("Items/" + itemId + "/Download", { - api_key: ApiClient.accessToken() + var downloadHref = ApiClient.getUrl("Items/" + itemId + "/Download", { + api_key: ApiClient.accessToken() + }); + + fileDownloader.download([ + { + url: downloadHref, + itemId: itemId, + serverId: serverId + }]); }); - fileDownloader.download([ - { - url: downloadHref, - itemId: itemId, - serverId: serverId - }]); - }); - + break; + } + case 'edit': + if (itemType == 'Timer') { + LibraryBrowser.editTimer(itemId); + } else { + LibraryBrowser.editMetadata(itemId); + } break; - } - case 'edit': - if (itemType == 'Timer') { - LibraryBrowser.editTimer(itemId); - } else { - LibraryBrowser.editMetadata(itemId); - } - break; - case 'editsubtitles': - LibraryBrowser.editSubtitles(itemId); - break; - case 'editimages': - LibraryBrowser.editImages(itemId); - break; - case 'identify': - LibraryBrowser.identifyItem(itemId); - break; - case 'refresh': - require(['refreshDialog'], function (refreshDialog) { - new refreshDialog({ - itemIds: [itemId], - serverId: serverId - }).show(); - }); - break; - default: - break; + case 'editsubtitles': + LibraryBrowser.editSubtitles(itemId); + break; + case 'editimages': + LibraryBrowser.editImages(itemId); + break; + case 'identify': + LibraryBrowser.identifyItem(itemId).then(resolve, reject); + break; + case 'refresh': + require(['refreshDialog'], function (refreshDialog) { + new refreshDialog({ + itemIds: [itemId], + serverId: serverId + }).show(); + }); + break; + default: + break; + } } - } - }); + }); + }); }); }, diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 7d45467b4d..81bde53b17 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -767,7 +767,7 @@ if (mainDrawerButton) { if (!visible && browserInfo.mobile) { - mainDrawerButton.classList.add('hide'); + mainDrawerButton.classList.remove('hide'); } else { mainDrawerButton.classList.remove('hide'); }