-
diff --git a/dashboard-ui/scripts/dlnaprofiles.js b/dashboard-ui/scripts/dlnaprofiles.js
index 5f0edf193..ddcaeeee5 100644
--- a/dashboard-ui/scripts/dlnaprofiles.js
+++ b/dashboard-ui/scripts/dlnaprofiles.js
@@ -34,7 +34,7 @@
var profile = profiles[i];
html += '
';
- html += '';
+ html += '';
html += profile.Name;
html += '';
@@ -69,7 +69,7 @@
var profile = profiles[i];
html += '';
- html += '';
+ html += '';
html += profile.Name;
html += '';
html += '';
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 9fd2a5ff9..47831acec 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -96,18 +96,9 @@
Dashboard.getCurrentUser().done(function (user) {
- if (item.Type == 'BoxSet' || item.Type == 'Playlist') {
- $('#fldDelete', page).show();
- }
- else if (user.Configuration.EnableContentDeletion &&
- item.Type != "TvChannel" &&
- item.Type != "Genre" &&
- item.Type != "Studio" &&
- item.Type != "MusicGenre" &&
- item.Type != "GameGenre" &&
- item.Type != "Person" &&
- item.Type != "MusicArtist" &&
- item.Type != "CollectionFolder") {
+ var moreCommands = LibraryBrowser.getMoreCommands(item, user);
+
+ if (moreCommands.indexOf('delete') != -1) {
$('#fldDelete', page).show();
} else {
$('#fldDelete', page).hide();
@@ -793,23 +784,12 @@
}).get();
}
- function performDelete(page) {
+ function onDeleted(id) {
+
+ var elem = $('#' + id)[0];
- $('#btnDelete', page).buttonEnabled(false);
- $('.btnRefresh', page).buttonEnabled(false);
- $('.btnSave', page).buttonEnabled(false);
-
- $('#refreshLoading', page).show();
-
- var parentId = currentItem.ParentId;
-
- ApiClient.deleteItem(currentItem.Id).done(function () {
-
- var elem = $('#' + parentId)[0];
-
- $('.libraryTree').jstree("select_node", elem, true)
- .jstree("delete_node", '#' + currentItem.Id);
- });
+ $('.libraryTree').jstree("select_node", elem, true)
+ .jstree("delete_node", '#' + id);
}
function editItemMetadataPage() {
@@ -1223,18 +1203,6 @@
var page = this;
- $('.btnRefreshBasic', this).on('click', function () {
-
- refreshWithOptions(page, {
-
- Recursive: true,
- ImageRefreshMode: 'FullRefresh',
- MetadataRefreshMode: 'FullRefresh',
- ReplaceAllImages: false,
- ReplaceAllMetadata: true
- });
- });
-
$('.btnRefreshAdvanced', this).on('click', function () {
performAdvancedRefresh(page);
@@ -1250,42 +1218,10 @@
$('.popupIdentifyForm', page).show();
$('.identificationSearchResults', page).hide();
$('.btnSearchAgain', page).hide();
-
});
- function getRandomInt(min, max) {
- return Math.floor(Math.random() * (max - min + 1) + min);
- }
-
$('#btnDelete', this).on('click', function () {
-
- if (currentItem.LocationType != "Remote" && currentItem.LocationType != "Virtual") {
- $('.deletePath', page).html((currentItem.Path || ''));
-
- var val1 = getRandomInt(6, 12);
- var val2 = getRandomInt(8, 16);
-
- $('#challengeValueText', page).html(val1 + ' * ' + val2 + ':');
-
- var val = val1 * val2;
-
- $('#fldChallengeValue', page).val(val);
-
- $('#popupConfirmDelete', page).popup('open');
-
- } else {
-
- var msg = "
" + Globalize.translate('ConfirmDeleteItem') + "
";
-
- Dashboard.confirm(msg, Globalize.translate('HeaderDeleteItem'), function (result) {
-
- if (result) {
-
- performDelete(page);
- }
-
- });
- }
+ LibraryBrowser.deleteItem(currentItem.Id);
});
$('.libraryTree', page).on('itemclicked', function (event, data) {
@@ -1315,6 +1251,21 @@
reload(page);
+ $(LibraryBrowser).on('itemdeleting.editor', function (e, itemId) {
+
+ if (currentItem && currentItem.Id == itemId) {
+ Dashboard.navigate('edititemmetadata.html');
+ }
+ });
+
+ }).on('pagehide', "#editItemMetadataPage", function () {
+
+ $(LibraryBrowser).off('itemdeleting.editor');
+
+ var page = this;
+
+ reload(page);
+
});
})(jQuery, document, window);
diff --git a/dashboard-ui/scripts/edititemsubtitles.js b/dashboard-ui/scripts/edititemsubtitles.js
index 7c201c1b7..39697d3a9 100644
--- a/dashboard-ui/scripts/edititemsubtitles.js
+++ b/dashboard-ui/scripts/edititemsubtitles.js
@@ -217,7 +217,7 @@
html += '
';
- html += '' + (result.Name) + '
';
+ html += '' + (result.Name) + '
';
html += '' + (result.Format) + '
';
if (result.Comment) {
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 755a9bdca..cf2c1da4a 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1587,8 +1587,17 @@
$(ApiClient).on('websocketmessage', onWebSocketMessage);
+ $(LibraryBrowser).on('itemdeleting.detailpage', function (e, itemId) {
+
+ if (currentItem && currentItem.Id == itemId) {
+ Dashboard.navigate('index.html');
+ }
+ });
+
}).on('pagehide', "#itemDetailPage", function () {
+ $(LibraryBrowser).off('itemdeleting.detailpage');
+
currentItem = null;
var page = this;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 7d4f70efa..811897d31 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -322,15 +322,66 @@
commands.push('playlist');
}
+ if (item.Type == 'BoxSet' || item.Type == 'Playlist') {
+ commands.push('delete');
+ }
+ else if (user.Configuration.EnableContentDeletion &&
+ item.Type != "TvChannel" &&
+ item.Type != "Genre" &&
+ item.Type != "Studio" &&
+ item.Type != "MusicGenre" &&
+ item.Type != "GameGenre" &&
+ item.Type != "Person" &&
+ item.Type != "MusicArtist" &&
+ item.Type != "CollectionFolder") {
+ commands.push('delete');
+ }
+
if (user.Configuration.IsAdministrator) {
if (item.Type != "Recording" && item.Type != "Program") {
commands.push('edit');
}
}
+ commands.push('refresh');
+
return commands;
},
+ refreshItem: function (itemId) {
+
+ ApiClient.refreshItem(itemId, {
+
+ Recursive: true,
+ ImageRefreshMode: 'FullRefresh',
+ MetadataRefreshMode: 'FullRefresh',
+ ReplaceAllImages: false,
+ ReplaceAllMetadata: true
+
+ });
+
+
+ Dashboard.alert(Globalize.translate('MessageRefreshQueued'));
+ },
+
+ deleteItem: function (itemId) {
+
+ // The timeout allows the flyout to close
+ setTimeout(function () {
+
+ var msg = "" + Globalize.translate('ConfirmDeleteItem') + "
";
+
+ Dashboard.confirm(msg, Globalize.translate('HeaderDeleteItem'), function (result) {
+
+ if (result) {
+ ApiClient.deleteItem(itemId);
+
+ $(LibraryBrowser).trigger('itemdeleting', [itemId]);
+ }
+ });
+ }, 250);
+ },
+
showMoreCommands: function (positionTo, itemId, commands) {
$('.playFlyout').popup("close").remove();
@@ -348,17 +399,39 @@
html += '' + Globalize.translate('ButtonEdit') + '';
}
+ if (commands.indexOf('refresh') != -1) {
+ html += '';
+ }
+
+ if (commands.indexOf('delete') != -1) {
+ html += '';
+ }
+
html += '';
html += '';
$($.mobile.activePage).append(html);
- $('.playFlyout').popup({ positionTo: positionTo || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
+ var elem = $('.playFlyout').popup({ positionTo: positionTo || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
$(this).off("popupafterclose").remove();
- }).parents(".ui-popup-container");
+ });
+
+ $('.btnMoreMenuRefresh', elem).on('click', function () {
+
+ ApiClient.refreshItem(itemId, {
+
+ Recursive: true,
+ ImageRefreshMode: 'FullRefresh',
+ MetadataRefreshMode: 'FullRefresh',
+ ReplaceAllImages: false,
+ ReplaceAllMetadata: true
+ }).done(function () {
+
+ });
+ });
},
getHref: function (item, context, topParentId) {
@@ -968,7 +1041,7 @@
imgUrl = ApiClient.getScaledImageUrl(item.Id, {
type: "Banner",
- maxWidth: 500,
+ maxWidth: 700,
tag: item.ImageTags.Banner
});
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index 3881b759c..a1dd5e02d 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -26,7 +26,7 @@
html += '';
- html += '
';
+ html += '
';
html += LibraryBrowser.getPosterViewHtml({
items: recommendation.Items,
lazy: true,
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 52742e334..ba1d50287 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1270,6 +1270,16 @@ $(function () {
e.preventDefault();
return false;
});
+
+ function isTouchDevice() {
+ return (('ontouchstart' in window)
+ || (navigator.MaxTouchPoints > 0)
+ || (navigator.msMaxTouchPoints > 0));
+ }
+
+ if (isTouchDevice()) {
+ $(document.body).addClass('touch');
+ }
});
Dashboard.jQueryMobileInit();
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index e376d12f7..5bbb7169e 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -21,7 +21,7 @@
}
if (user.Id && loggedInUser.Configuration.IsAdministrator) {
- $('#fldConnectInfo', page).hide();
+ $('#fldConnectInfo', page).show();
} else {
$('#fldConnectInfo', page).hide();
}
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index 4183d1c8d..b62107605 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -31,14 +31,14 @@
-
+
${NoNextUpItemsMessage}