diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html index adfaed4dc..28320706c 100644 --- a/dashboard-ui/channelsettings.html +++ b/dashboard-ui/channelsettings.html @@ -47,6 +47,11 @@ ${ButtonSelectDirectory}
${HeaderChapterDownloadingHelp}
${LabelGroupChannelsIntoViews}
${MessageLoadingContent}
'; errorMsg += ''; errorMsg += Globalize.translate('MessageInternetExplorerWebm'); diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 7134d3393..9dcd0c981 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -84,7 +84,7 @@ } // Chrome or IE with plugin installed - if (canPlayWebm()) { + if (self.canPlayWebm()) { return '.webm'; } @@ -139,7 +139,7 @@ if (finalParams.isStatic) { currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4'); } else { - currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension); + currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension); } currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate); @@ -289,7 +289,7 @@ //return false; } - if (extension == 'm4v') { + if (extension == 'm4v' || extension == 'mkv') { return $.browser.chrome; } @@ -1094,7 +1094,7 @@ $(self).trigger('volumechange', [state]); }; - self.cleanup = function() { + self.cleanup = function () { }; @@ -1167,10 +1167,10 @@ } } - function canPlayWebm() { + self.canPlayWebm = function() { return testableVideoElement.canPlayType('video/webm').replace(/no/, ''); - } + }; self.canAutoPlayAudio = function () { diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js index 025ddb1d5..7b6081f10 100644 --- a/dashboard-ui/scripts/metadataadvanced.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -7,6 +7,14 @@ $('#chkEnableFanartUpdates', page).checked(config.EnableFanArtUpdates).checkboxradio("refresh"); $('#txtMetadataPath', page).val(config.MetadataPath || ''); + $('#chkPeopleActors', page).checked(config.PeopleMetadataOptions.DownloadActorMetadata).checkboxradio("refresh"); + $('#chkPeopleComposers', page).checked(config.PeopleMetadataOptions.DownloadComposerMetadata).checkboxradio("refresh"); + $('#chkPeopleDirectors', page).checked(config.PeopleMetadataOptions.DownloadDirectorMetadata).checkboxradio("refresh"); + $('#chkPeopleProducers', page).checked(config.PeopleMetadataOptions.DownloadProducerMetadata).checkboxradio("refresh"); + $('#chkPeopleWriters', page).checked(config.PeopleMetadataOptions.DownloadWriterMetadata).checkboxradio("refresh"); + $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh"); + $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh"); + Dashboard.hideLoadingMsg(); } @@ -171,6 +179,14 @@ config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked(); config.MetadataPath = $('#txtMetadataPath', form).val(); + config.PeopleMetadataOptions.DownloadActorMetadata = $('#chkPeopleActors', form).checked(); + config.PeopleMetadataOptions.DownloadComposerMetadata = $('#chkPeopleComposers', form).checked(); + config.PeopleMetadataOptions.DownloadDirectorMetadata = $('#chkPeopleDirectors', form).checked(); + config.PeopleMetadataOptions.DownloadGuestStarMetadata = $('#chkPeopleGuestStars', form).checked(); + config.PeopleMetadataOptions.DownloadProducerMetadata = $('#chkPeopleProducers', form).checked(); + config.PeopleMetadataOptions.DownloadWriterMetadata = $('#chkPeopleWriters', form).checked(); + config.PeopleMetadataOptions.DownloadOtherPeopleMetadata = $('#chkPeopleOthers', form).checked(); + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); } diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js index 84f5f018d..608b435ba 100644 --- a/dashboard-ui/scripts/mypreferencesdisplay.js +++ b/dashboard-ui/scripts/mypreferencesdisplay.js @@ -7,6 +7,7 @@ $('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh"); $('#chkDisplayCollectionView', page).checked(user.Configuration.DisplayCollectionsView || false).checkboxradio("refresh"); + $('#chkDisplayFolderView', page).checked(user.Configuration.DisplayFoldersView || false).checkboxradio("refresh"); ApiClient.getItems(user.Id, {}).done(function (result) { @@ -77,6 +78,7 @@ user.Configuration.GroupMoviesIntoBoxSets = $('#chkGroupMoviesIntoCollections', page).checked(); user.Configuration.DisplayCollectionsView = $('#chkDisplayCollectionView', page).checked(); + user.Configuration.DisplayFoldersView = $('#chkDisplayFolderView', page).checked(); user.Configuration.ExcludeFoldersFromGrouping = $(".chkGroupFolder:not(:checked)", page).get().map(function (i) { diff --git a/dashboard-ui/scripts/playlistmanager.js b/dashboard-ui/scripts/playlistmanager.js index 706214e32..19b529244 100644 --- a/dashboard-ui/scripts/playlistmanager.js +++ b/dashboard-ui/scripts/playlistmanager.js @@ -33,6 +33,7 @@ function getNewPlaylistPanel() { + Dashboard.showLoadingMsg(); $('.newPlaylistPanel').panel('destroy').remove(); var html = ''; @@ -103,6 +104,7 @@ select.html(selectHtml).selectmenu('refresh'); select.val(lastPlaylistId || '').selectmenu('refresh').trigger('change'); + Dashboard.hideLoadingMsg(); }); $('form', elem).on('submit', onAddToPlaylistFormSubmit); diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js index da40fb406..2e6de8300 100644 --- a/dashboard-ui/scripts/playlists.js +++ b/dashboard-ui/scripts/playlists.js @@ -18,9 +18,18 @@ return 'playlists' + (query.ParentId || ''); } + function showLoadingMessage(page) { + + $('.popupLoading', page).popup('open'); + } + + function hideLoadingMessage(page) { + $('.popupLoading', page).popup('close'); + } + function reloadItems(page) { - Dashboard.showLoadingMsg(); + showLoadingMessage(page); var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query); var promise2 = Dashboard.getCurrentUser(); @@ -91,7 +100,7 @@ LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); - Dashboard.hideLoadingMsg(); + hideLoadingMessage(page); }); }