Conflicts:
	MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
	MediaBrowser.Model/IO/IZipClient.cs
This commit is contained in:
Luke Pulverenti 2014-12-28 23:13:03 -05:00
parent 122a1cf222
commit 1784c702e6

View File

@ -401,7 +401,7 @@
}
if (commands.indexOf('refresh') != -1) {
html += '<li><a class="btnMoreMenuRefresh" href="#" onclick="$(\'.playFlyout\').popup(\'close\');LibraryBrowser.refreshItem([\'' + itemId + '\']);">' + Globalize.translate('ButtonRefresh') + '</a></li>';
html += '<li><a class="btnMoreMenuRefresh" href="#">' + Globalize.translate('ButtonRefresh') + '</a></li>';
}
if (commands.indexOf('delete') != -1) {
@ -422,6 +422,8 @@
$('.btnMoreMenuRefresh', elem).on('click', function () {
$('.playFlyout').popup('close');
ApiClient.refreshItem(itemId, {
Recursive: true,