diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index aa1aaaa5a5..09aedc9fa1 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -44,7 +44,7 @@ } .cardBox { - margin: 3px; + margin: 2px; } .largeCardMargin .cardBox { @@ -55,7 +55,7 @@ margin: 4px; } -@media all and (max-width: 600px) { +@media all and (max-width: 800px) { .cardBox { margin: 1px; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index fdbe317dd0..b4d6d4bf44 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -282,7 +282,7 @@ } } -@media all and (max-width: 1200px) { +@media all and (max-width: 800px) { /* They can use the left menu */ .dashboardEntryHeaderButton { diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html index a31669e0fd..6e09abc416 100644 --- a/dashboard-ui/livetvsettings.html +++ b/dashboard-ui/livetvsettings.html @@ -4,7 +4,7 @@ ${TitleLiveTV} -
+
@@ -70,10 +70,6 @@
- -
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 301c6287f6..0b77479c0e 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -808,7 +808,11 @@ function getAlbumArtists(form) { - return $('#txtAlbumArtist', form).val().split(';').map(function (a) { + return $('#txtAlbumArtist', form).val().trim().split(';').filter(function(s){ + + return s.length > 0; + + }).map(function (a) { return { Name: a @@ -818,7 +822,11 @@ function getArtists(form) { - return $('#txtArtist', form).val().split(';').map(function (a) { + return $('#txtArtist', form).val().trim().split(';').filter(function(s){ + + return s.length > 0; + + }).map(function (a) { return { Name: a diff --git a/dashboard-ui/scripts/livetvsettings.js b/dashboard-ui/scripts/livetvsettings.js index dd5d1b5a23..d0c5eacc90 100644 --- a/dashboard-ui/scripts/livetvsettings.js +++ b/dashboard-ui/scripts/livetvsettings.js @@ -19,7 +19,29 @@ Dashboard.hideLoadingMsg(); } - $(document).on('pageshow', "#liveTvSettingsPage", function () { + function onSubmit() { + + Dashboard.showLoadingMsg(); + + var form = this; + + ApiClient.getNamedConfiguration("livetv").done(function (config) { + + config.GuideDays = $('#selectGuideDays', form).val() || null; + config.EnableMovieProviders = $('#chkMovies', form).checked(); + + ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult); + }); + + // Disable default form submission + return false; + } + + $(document).on('pageinitdepends', "#liveTvSettingsPage", function () { + + $('.liveTvSettingsForm').off('submit', onSubmit).on('submit', onSubmit); + + }).on('pageshowready', "#liveTvSettingsPage", function () { Dashboard.showLoadingMsg(); @@ -37,25 +59,4 @@ }); - window.LiveTvSettingsPage = { - - onSubmit: function () { - - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getNamedConfiguration("livetv").done(function (config) { - - config.GuideDays = $('#selectGuideDays', form).val() || null; - config.EnableMovieProviders = $('#chkMovies', form).checked(); - - ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } - }; - })(jQuery, document, window); diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 894234dbaa..930c684039 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -271,7 +271,7 @@ var mediaControls = $("#videoPlayer"); - var state = self.getPlayerStateInternal(self.currentMediaElement, item, self.currentMediaSource); + var state = self.getPlayerStateInternal(self.currentMediaRenderer, item, self.currentMediaSource); var url = ""; var imageWidth = 400; @@ -751,7 +751,7 @@ return currentStream.Type == "Audio"; }); - var currentIndex = getParameterByName('AudioStreamIndex', self.getCurrentSrc(self.currentMediaElement)); + var currentIndex = getParameterByName('AudioStreamIndex', self.getCurrentSrc(self.currentMediaRenderer)); var html = ''; html += '
'; @@ -917,7 +917,7 @@ function getQualityFlyoutHtml() { - var currentSrc = self.getCurrentSrc(self.currentMediaElement).toLowerCase(); + var currentSrc = self.getCurrentSrc(self.currentMediaRenderer).toLowerCase(); var isStatic = currentSrc.indexOf('static=true') != -1; var videoStream = self.currentMediaSource.MediaStreams.filter(function (stream) { @@ -1042,13 +1042,11 @@ }; // Replace audio version - self.cleanup = function (playerElement) { + self.cleanup = function (mediaRenderer) { - if (playerElement.tagName.toLowerCase() == 'video') { - currentTimeElement.html('--:--'); + currentTimeElement.html('--:--'); - unbindEventsForPlayback(); - } + unbindEventsForPlayback(); }; self.playVideo = function (item, mediaSource, startPosition) { @@ -1109,10 +1107,7 @@ var requiresNativeControls = !self.enableCustomVideoControls(); // Can't autoplay in these browsers so we need to use the full controls - if (requiresNativeControls && AppInfo.isNativeApp && $.browser.android) { - html += '