diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 70c21291a6..0d356283f0 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -498,7 +498,7 @@ $('#fldRecursive', page).hide(); } - if (item.LocationType == "Virtual" || item.LocationType == "Remote") { + if (item.Type != "Channel" && item.Type != "Genre" && item.Type != "Studio" && item.Type != "MusicGenre" && item.Type != "GameGenre" && item.Type != "Person" && item.Type != "MusicArtist") { $('#fldDelete', page).show(); } else { $('#fldDelete', page).hide(); @@ -1494,7 +1494,15 @@ $('#btnDelete', this).on('click', function () { - Dashboard.confirm("Are you sure you wish to delete this item?", "Confirm Deletion", function (result) { + var msg = "

Are you sure you wish to delete this item from your library?

"; + + if (currentItem.LocationType != "Remote" && currentItem.LocationType != "Virtual") { + msg = "

The following media location will be deleted:

"; + msg += "

" + currentItem.Path + "

"; + msg += "

Are you sure you wish to continue?

"; + } + + Dashboard.confirm(msg, "Confirm Deletion", function (result) { if (result) { diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index bfdf23c2d7..5ba5fc5fd1 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1170,16 +1170,8 @@ renderCriticReviews(page, currentItem); - }).on('swipeleft.sibling', function() { - - $('.lnkNextItem', page)[0].click(); - - }).on('swiperight.sibling', function () { - - $('.lnkPreviousItem', page)[0].click(); }); - reload(page); }).on('pagehide', "#itemDetailPage", function () { @@ -1188,7 +1180,7 @@ var page = this; - $(page).off("click.moreScenes").off("click.morePeople").off("click.moreSpecials").off("click.moreCriticReviews").off("swipeleft.sibling").off("swiperight.sibling"); + $(page).off("click.moreScenes").off("click.morePeople").off("click.moreSpecials").off("click.moreCriticReviews"); }); function itemDetailPage() {