From 1784c702e6d37f0f227adaf3ff8d5a2c21704418 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 28 Dec 2014 23:13:03 -0500 Subject: [PATCH] Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser Conflicts: MediaBrowser.Common.Implementations/Archiving/ZipClient.cs MediaBrowser.Model/IO/IZipClient.cs --- dashboard-ui/scripts/librarybrowser.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 553d6f6bd4..c5cb643003 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -401,7 +401,7 @@ } if (commands.indexOf('refresh') != -1) { - html += '
  • ' + Globalize.translate('ButtonRefresh') + '
  • '; + html += '
  • ' + Globalize.translate('ButtonRefresh') + '
  • '; } if (commands.indexOf('delete') != -1) { @@ -422,6 +422,8 @@ $('.btnMoreMenuRefresh', elem).on('click', function () { + $('.playFlyout').popup('close'); + ApiClient.refreshItem(itemId, { Recursive: true,