Merge branch 'master' into networkChange

src/controllers/dashboard/dashboard.html

@@ -16,6 +16,9 @@
                     </div>
 
                     <div style="margin-top:1em;">
+                        <button is="emby-button" type="button" class="raised btnRefresh">
+                            <span>${ButtonScanAllLibraries}</span>
+                        </button>
                         <button is="emby-button" type="button" id="btnRestartServer" class="raised" onclick="DashboardPage.restart(this);" style="margin-left:0;">
                             <span>${Restart}</span>
                         </button>

src/controllers/dashboard/dashboard.js

@@ -3,6 +3,7 @@ import events from 'events';
 import itemHelper from 'itemHelper';
 import serverNotifications from 'serverNotifications';
 import dom from 'dom';
+import taskButton from 'scripts/taskbutton';
 import globalize from 'globalize';
 import * as datefns from 'date-fns';
 import dfnshelper from 'dfnshelper';
@@ -550,13 +551,13 @@ import 'emby-itemscontainer';
                 row.classList.remove('playingSession');
             }
 
-            if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== window.connectionManager.deviceId()) {
+            if (session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1) {
                 row.querySelector('.btnSessionSendMessage').classList.remove('hide');
             } else {
                 row.querySelector('.btnSessionSendMessage').classList.add('hide');
             }
 
-            if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons.length) {
+            if (session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo) {
                 row.querySelector('.btnSessionInfo').classList.remove('hide');
             } else {
                 row.querySelector('.btnSessionInfo').classList.add('hide');
@@ -564,7 +565,7 @@ import 'emby-itemscontainer';
 
             const btnSessionPlayPause = row.querySelector('.btnSessionPlayPause');
 
-            if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== window.connectionManager.deviceId()) {
+            if (session.ServerId && nowPlayingItem && session.SupportsRemoteControl) {
                 btnSessionPlayPause.classList.remove('hide');
                 row.querySelector('.btnSessionStop').classList.remove('hide');
             } else {
@@ -827,9 +828,17 @@ import 'emby-itemscontainer';
                 refreshActiveRecordings(view, apiClient);
                 loading.hide();
             }
+
+            taskButton({
+                mode: 'on',
+                taskKey: 'RefreshLibrary',
+                button: page.querySelector('.btnRefresh')
+            });
         });
         view.addEventListener('viewbeforehide', function () {
             const apiClient = ApiClient;
+            const page = this;
+
             events.off(serverNotifications, 'RestartRequired', onRestartRequired);
             events.off(serverNotifications, 'ServerShuttingDown', onServerShuttingDown);
             events.off(serverNotifications, 'ServerRestarting', onServerRestarting);
@@ -841,6 +850,12 @@ import 'emby-itemscontainer';
             if (apiClient) {
                 DashboardPage.stopInterval(apiClient);
             }
+
+            taskButton({
+                mode: 'off',
+                taskKey: 'RefreshLibrary',
+                button: page.querySelector('.btnRefresh')
+            });
         });
         view.addEventListener('viewdestroy', function () {
             const page = this;

src/controllers/dashboard/devices/devices.html

@@ -5,6 +5,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards flex align-items-center">
                     <h2 class="sectionTitle sectionTitle-cards">${HeaderDevices}</h2>
                     <a is="emby-linkbutton" rel="noopener noreferrer" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a>
+                    <button id="deviceDeleteAll" is="emby-button" type="button" class="raised button-alt">${DeleteAll}</button>
                 </div>
             </div>
             <div is="emby-itemscontainer" class="devicesList vertical-wrap" data-multiselect="false"></div>

src/controllers/dashboard/devices/devices.js

@@ -10,10 +10,32 @@ import 'cardStyle';
 
 /* eslint-disable indent */
 
+    // Local cache of loaded
+    let deviceIds = [];
+
     function canDelete(deviceId) {
         return deviceId !== ApiClient.deviceId();
     }
 
+    function deleteAllDevices(page) {
+        const msg = globalize.translate('DeleteDevicesConfirmation');
+
+        require(['confirm'], async function (confirm) {
+            await confirm({
+                text: msg,
+                title: globalize.translate('HeaderDeleteDevices'),
+                confirmText: globalize.translate('ButtonDelete'),
+                primary: 'delete'
+            });
+
+            loading.show();
+            await Promise.all(
+                deviceIds.filter(canDelete).map((id) => ApiClient.deleteDevice(id))
+            );
+            loadData(page);
+        });
+    }
+
     function deleteDevice(page, id) {
         const msg = globalize.translate('DeleteDeviceConfirmation');
 
@@ -23,16 +45,10 @@ import 'cardStyle';
                 title: globalize.translate('HeaderDeleteDevice'),
                 confirmText: globalize.translate('Delete'),
                 primary: 'delete'
-            }).then(function () {
+            }).then(async () => {
                 loading.show();
-                ApiClient.ajax({
-                    type: 'DELETE',
-                    url: ApiClient.getUrl('Devices', {
-                        Id: id
-                    })
-                }).then(function () {
-                    loadData(page);
-                });
+                await ApiClient.deleteDevice(id);
+                loadData(page);
             });
         });
     }
@@ -129,6 +145,7 @@ import 'cardStyle';
         loading.show();
         ApiClient.getJSON(ApiClient.getUrl('Devices')).then(function (result) {
             load(page, result.Items);
+            deviceIds = result.Items.map((device) => device.Id);
             loading.hide();
         });
     }
@@ -145,6 +162,9 @@ import 'cardStyle';
         view.addEventListener('viewshow', function () {
             loadData(this);
         });
-    }
 
+        view.querySelector('#deviceDeleteAll').addEventListener('click', function() {
+            deleteAllDevices(view);
+        });
+    }
 /* eslint-enable indent */

src/controllers/dashboard/quickConnect.html

@@ -0,0 +1,24 @@
+<div id="quickConnectPage" data-role="page" class="page type-interior advancedConfigurationPage">
+    <div class="content-primary">
+        <form class="quickConnectSettings">
+            <div class="verticalSection">
+                <div class="sectionTitleContainer flex align-items-center">
+                    <h2 class="sectionTitle">${QuickConnect}</h2>
+                </div>
+            </div>
+
+            <div>${LabelCurrentStatus}<span id="quickConnectStatus" style="padding:0 0.4em;"></span></div>
+
+            <div class="checkboxList paperList" style="padding:.5em 1em;">
+                <label>
+                    <input type="checkbox" is="emby-checkbox" id="chkQuickConnectAvailable" />
+                    <span>${EnableQuickConnect}</span>
+                </label>
+            </div>
+
+            <button is="emby-button" id="btnQuickConnectSubmit" type="submit" class="raised button-submit block">
+                <span>${Save}</span>
+            </button>
+        </form>
+    </div>
+</div>

src/controllers/dashboard/users/useredit.html

@@ -140,32 +140,13 @@
                     </div>
                     <div class="fieldDescription">${OptionAllowRemoteSharedDevicesHelp}</div>
                 </div>
-                <div class="verticalSection">
-                    <h2 class="checkboxListLabel">${HeaderDownloadSync}</h2>
-                    <div class="checkboxList paperList" style="padding:.5em 1em;">
-                        <label>
-                            <input type="checkbox" is="emby-checkbox" id="chkEnableDownloading" />
-                            <span>${OptionAllowContentDownloading}</span>
-                        </label>
-                        <label>
-                            <input type="checkbox" is="emby-checkbox" id="chkEnableSyncTranscoding" />
-                            <span>${OptionAllowSyncTranscoding}</span>
-                        </label>
-                    </div>
-                </div>
+                <h2 class="checkboxListLabel">${Other}</h2>
                 <div class="checkboxContainer checkboxContainer-withDescription">
                     <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkEnableConversion" />
-                        <span>${AllowMediaConversion}</span>
+                        <input type="checkbox" is="emby-checkbox" id="chkEnableDownloading" />
+                        <span>${OptionAllowContentDownload}</span>
                     </label>
-                    <div class="fieldDescription checkboxFieldDescription">${AllowMediaConversionHelp}</div>
-                </div>
-                <div class="checkboxContainer checkboxContainer-withDescription">
-                    <label>
-                        <input type="checkbox" is="emby-checkbox" id="chkEnableSharing" />
-                        <span>${OptionAllowLinkSharing}</span>
-                    </label>
-                    <div class="fieldDescription checkboxFieldDescription sharingHelp"></div>
+                    <div class="fieldDescription checkboxFieldDescription">${OptionAllowContentDownloadHelp}</div>
                 </div>
                 <div class="checkboxContainer checkboxContainer-withDescription" id="fldIsEnabled">
                     <label>

src/controllers/dashboard/users/useredit.js

@@ -97,9 +97,6 @@ import globalize from 'globalize';
         $('#chkEnableVideoPlaybackRemuxing', page).prop('checked', user.Policy.EnablePlaybackRemuxing);
         $('#chkForceRemoteSourceTranscoding', page).prop('checked', user.Policy.ForceRemoteSourceTranscoding);
         $('#chkRemoteAccess', page).prop('checked', user.Policy.EnableRemoteAccess == null || user.Policy.EnableRemoteAccess);
-        $('#chkEnableSyncTranscoding', page).prop('checked', user.Policy.EnableSyncTranscoding);
-        $('#chkEnableConversion', page).prop('checked', user.Policy.EnableMediaConversion || false);
-        $('#chkEnableSharing', page).prop('checked', user.Policy.EnablePublicSharing);
         $('#txtRemoteClientBitrateLimit', page).val(user.Policy.RemoteClientBitrateLimit / 1e6 || '');
         $('#txtLoginAttemptsBeforeLockout', page).val(user.Policy.LoginAttemptsBeforeLockout || '0');
         $('#txtMaxActiveSessions', page).val(user.Policy.MaxActiveSessions || '0');
@@ -133,9 +130,6 @@ import globalize from 'globalize';
         user.Policy.EnablePlaybackRemuxing = $('#chkEnableVideoPlaybackRemuxing', page).is(':checked');
         user.Policy.ForceRemoteSourceTranscoding = $('#chkForceRemoteSourceTranscoding', page).is(':checked');
         user.Policy.EnableContentDownloading = $('#chkEnableDownloading', page).is(':checked');
-        user.Policy.EnableSyncTranscoding = $('#chkEnableSyncTranscoding', page).is(':checked');
-        user.Policy.EnableMediaConversion = $('#chkEnableConversion', page).is(':checked');
-        user.Policy.EnablePublicSharing = $('#chkEnableSharing', page).is(':checked');
         user.Policy.EnableRemoteAccess = $('#chkRemoteAccess', page).is(':checked');
         user.Policy.RemoteClientBitrateLimit = parseInt(1e6 * parseFloat($('#txtRemoteClientBitrateLimit', page).val() || '0'));
         user.Policy.LoginAttemptsBeforeLockout = parseInt($('#txtLoginAttemptsBeforeLockout', page).val() || '0');

src/controllers/dashboard/users/userlibraryaccess.js

@@ -51,7 +51,9 @@ import globalize from 'globalize';
             $('.channelAccessContainer', page).hide();
         }
 
-        $('#chkEnableAllChannels', page).prop('checked', user.Policy.EnableAllChannels);
+        const chkEnableAllChannels = page.querySelector('#chkEnableAllChannels');
+        chkEnableAllChannels.checked = user.Policy.EnableAllChannels;
+        triggerChange(chkEnableAllChannels);
     }
 
     function loadDevices(page, user, devices) {
@@ -67,7 +69,9 @@ import globalize from 'globalize';
 
         html += '</div>';
         $('.deviceAccess', page).show().html(html);
-        $('#chkEnableAllDevices', page).prop('checked', user.Policy.EnableAllDevices);
+        const chkEnableAllDevices = page.querySelector('#chkEnableAllDevices');
+        chkEnableAllDevices.checked = user.Policy.EnableAllDevices;
+        triggerChange(chkEnableAllDevices);
 
         if (user.Policy.IsAdministrator) {
             page.querySelector('.deviceAccessContainer').classList.add('hide');