';
@@ -731,7 +733,7 @@
var chkItemSelectId = 'chkItemSelect' + i;
// Render this pre-enhanced to save on jquery mobile dom manipulation
- html += '
';
+ html += '
';
}
@@ -1158,21 +1160,6 @@
}
},
- getViewSummaryHtml: function (query, checkedSortOption) {
-
- var html = '';
-
- if (query.SortBy) {
-
- var id = checkedSortOption[0].id;
- var sortBy = checkedSortOption.siblings('label[for=' + id + ']').text();
-
- html += 'Sorted by ' + sortBy.trim().toLowerCase() + ', ' + (query.SortOrder || 'ascending').toLowerCase();
- }
-
- return html;
- },
-
getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes, showLimit) {
if (query.Limit && updatePageSizeSetting !== false) {
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index e7e7da346b..ed448b68a1 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -175,18 +175,25 @@
function splitVersions(id, page) {
- Dashboard.showLoadingMsg();
+ Dashboard.confirm("Are you sure you wish to split the versions apart into separate items?", "Split Versions Apart", function (confirmResult) {
- $.ajax({
- type: "DELETE",
- url: ApiClient.getUrl("Videos/" + id + "/AlternateVersions")
+ if (confirmResult) {
- }).done(function () {
+ Dashboard.showLoadingMsg();
- Dashboard.hideLoadingMsg();
+ $.ajax({
+ type: "DELETE",
+ url: ApiClient.getUrl("Videos/" + id + "/AlternateVersions")
- $('.itemsContainer', page).trigger('needsrefresh');
+ }).done(function () {
+
+ Dashboard.hideLoadingMsg();
+
+ $('.itemsContainer', page).trigger('needsrefresh');
+ });
+ }
});
+
}
function getContextMenuOptions(elem) {
@@ -205,7 +212,7 @@
items.push({ type: 'divider' });
items.push({ type: 'header', text: 'Manage' });
- items.push({ type: 'command', text: 'Split Versions', name: 'SplitVersions' });
+ items.push({ type: 'command', text: 'Split Versions Apart', name: 'SplitVersions' });
}
return items;
@@ -221,7 +228,7 @@
return;
}
- if ($('.itemSelectionPanel', elem).length) {
+ if ($('.itemSelectionPanel:visible', elem).length) {
return;
}
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index ac9db18fc2..15fdc48755 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -28,9 +28,6 @@
if (result.TotalRecordCount) {
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index d6390e9105..8cb64c2e10 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -29,9 +29,6 @@
updateFilterControls(page);
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 2b3f150fa5..e4364d0e4c 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -26,9 +26,6 @@
updateFilterControls(page);
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index a8cdc6c399..45e4e2738a 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -28,9 +28,6 @@
updateFilterControls(page);
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js
index 1df1ba34a4..2cc211b7cd 100644
--- a/dashboard-ui/scripts/musicvideos.js
+++ b/dashboard-ui/scripts/musicvideos.js
@@ -26,9 +26,6 @@
updateFilterControls(page);
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index 774ab87f16..8dd595c3cc 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -47,9 +47,6 @@
updateFilterControls(page);
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
html += LibraryBrowser.getSongTableHtml(result.Items, {
showAlbum: true,
showArtist: true,
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 1e1a8ca3ab..12cfa73aa4 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -28,9 +28,6 @@
updateFilterControls(page);
- var checkSortOption = $('.radioSortBy:checked', page);
- $('.viewSummary', page).html(LibraryBrowser.getViewSummaryHtml(query, checkSortOption)).trigger('create');
-
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index 7a81b6ea99..c496b09bee 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -22,11 +22,10 @@