From 39020714f75b1bd1fe41355d4e9dadc9620ed8a1 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Mon, 11 Mar 2013 10:54:08 -0400 Subject: [PATCH] live saving on the metadata pages --- .../Playback/Progressive/VideoService.cs | 1 + .../Html/advancedMetadata.html | 7 +- MediaBrowser.WebDashboard/Html/metadata.html | 17 +-- .../Html/metadataImages.html | 137 +++++++++--------- .../AdvancedMetadataConfigurationPage.js | 10 +- .../Html/scripts/MetadataConfigurationPage.js | 8 +- .../Html/scripts/MetadataImagesPage.js | 8 +- 7 files changed, 99 insertions(+), 89 deletions(-) diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index d8ffa61fdc..10455c0288 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -20,6 +20,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Videos/{Id}/stream.mkv", "GET")] [Route("/Videos/{Id}/stream.mpeg", "GET")] [Route("/Videos/{Id}/stream.avi", "GET")] + [Route("/Videos/{Id}/stream.m2ts", "GET")] [Route("/Videos/{Id}/stream", "GET")] [ServiceStack.ServiceHost.Api(Description = "Gets a video stream")] public class GetVideoStream : VideoStreamRequest diff --git a/MediaBrowser.WebDashboard/Html/advancedMetadata.html b/MediaBrowser.WebDashboard/Html/advancedMetadata.html index 60e02ba3c0..6ea3d7e74b 100644 --- a/MediaBrowser.WebDashboard/Html/advancedMetadata.html +++ b/MediaBrowser.WebDashboard/Html/advancedMetadata.html @@ -21,13 +21,10 @@
-
  • - -
  • diff --git a/MediaBrowser.WebDashboard/Html/metadata.html b/MediaBrowser.WebDashboard/Html/metadata.html index 4618dd4bd8..28fd7dedd0 100644 --- a/MediaBrowser.WebDashboard/Html/metadata.html +++ b/MediaBrowser.WebDashboard/Html/metadata.html @@ -18,32 +18,29 @@
    diff --git a/MediaBrowser.WebDashboard/Html/metadataImages.html b/MediaBrowser.WebDashboard/Html/metadataImages.html index b06a3205b7..0197af43da 100644 --- a/MediaBrowser.WebDashboard/Html/metadataImages.html +++ b/MediaBrowser.WebDashboard/Html/metadataImages.html @@ -18,7 +18,7 @@
    diff --git a/MediaBrowser.WebDashboard/Html/scripts/AdvancedMetadataConfigurationPage.js b/MediaBrowser.WebDashboard/Html/scripts/AdvancedMetadataConfigurationPage.js index 73ed3f4311..8b89add10a 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/AdvancedMetadataConfigurationPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/AdvancedMetadataConfigurationPage.js @@ -33,7 +33,7 @@ var checkedAttribute = configuration.InternetProviderExcludeTypes.indexOf(type) != -1 ? ' checked="checked"' : ''; - html += ''; + html += ''; html += ''; } @@ -42,6 +42,12 @@ $('#divItemTypes', page).html(html).trigger("create"); }, + submit: function () { + + $('.btnSubmit', $.mobile.activePage)[0].click(); + + }, + onSubmit: function () { Dashboard.showLoadingMsg(); @@ -54,7 +60,7 @@ return currentCheckbox.getAttribute('data-itemtype'); }); - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + ApiClient.updateServerConfiguration(config); }); // Disable default form submission diff --git a/MediaBrowser.WebDashboard/Html/scripts/MetadataConfigurationPage.js b/MediaBrowser.WebDashboard/Html/scripts/MetadataConfigurationPage.js index e68940b832..f7a9ba07b2 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/MetadataConfigurationPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/MetadataConfigurationPage.js @@ -79,6 +79,12 @@ $('#selectLanguage', '#metadataConfigurationPage').html(html).selectmenu("refresh"); }, + submit: function () { + + $('.btnSubmit', $.mobile.activePage)[0].click(); + + }, + onSubmit: function () { Dashboard.showLoadingMsg(); @@ -92,7 +98,7 @@ config.PreferredMetadataLanguage = $('#selectLanguage', form).val(); config.MetadataCountryCode = $('#selectCountry', form).val(); - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + ApiClient.updateServerConfiguration(config); }); // Disable default form submission diff --git a/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js b/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js index 0dff46c398..e09172d36e 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/MetadataImagesPage.js @@ -42,6 +42,12 @@ Dashboard.hideLoadingMsg(); }, + submit: function () { + + $('.btnSubmit', $.mobile.activePage)[0].click(); + + }, + onSubmit: function () { Dashboard.showLoadingMsg(); @@ -75,7 +81,7 @@ config.DownloadMusicAlbumImages.Primary = $('#chkDownloadAlbumPrimary', form).checked(); config.DownloadMusicAlbumImages.Backdrops = $('#chkDownloadAlbumBackdrops', form).checked(); - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + ApiClient.updateServerConfiguration(config); }); // Disable default form submission