From 28f378f8db47c9f63f90d5b64340305f935c486b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 26 May 2015 11:31:50 -0400 Subject: [PATCH] update translations --- dashboard-ui/css/site.css | 4 + dashboard-ui/scripts/chromecast.js | 2 +- dashboard-ui/scripts/episodes.js | 2 +- dashboard-ui/scripts/externalplayer.js | 5 +- dashboard-ui/scripts/librarymenu.js | 4 +- dashboard-ui/scripts/mediaplayer-video.js | 14 +- dashboard-ui/scripts/mediaplayer.js | 14 +- dashboard-ui/scripts/moviecollections.js | 2 +- dashboard-ui/scripts/movies.js | 2 +- dashboard-ui/scripts/photos.js | 2 +- dashboard-ui/scripts/site.js | 37 +++- dashboard-ui/scripts/tvshows.js | 2 +- .../thirdparty/apiclient/apiclient.js | 11 ++ .../thirdparty/apiclient/connectionmanager.js | 6 + .../thirdparty/cordova/android/immersive.js | 34 ++++ dashboard-ui/thirdparty/cordova/chromecast.js | 2 +- .../thirdparty/cordova/externalplayer.js | 27 --- .../cordova/registrationservices.js | 167 +++++++++++++++++- .../thirdparty/cordova/serverdiscovery.js | 11 ++ 19 files changed, 284 insertions(+), 64 deletions(-) create mode 100644 dashboard-ui/thirdparty/cordova/android/immersive.js diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index f140818d9f..80d5303960 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -202,6 +202,10 @@ h1 a:hover { display: none; } +body:not(.enableBackButton) .headerBackButton { + display: none; +} + /** * Note: I have omitted any vendor-prefixes for clarity. * Adding them is left as an exercise for the reader. diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index b7e694b9b0..c1891de592 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -350,7 +350,7 @@ getEndpointInfo().done(function (endpoint) { if (endpoint.IsLocal || endpoint.IsInNetwork) { - ApiClient.getSystemInfo().done(function (info) { + ApiClient.getPublicSystemInfo().done(function (info) { message.serverAddress = info.LocalAddress; player.sendMessageInternal(message); diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index dddfe553da..7b40ed76a1 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -1,6 +1,6 @@ (function ($, document) { - var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); + var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); // The base query options var query = { diff --git a/dashboard-ui/scripts/externalplayer.js b/dashboard-ui/scripts/externalplayer.js index 6e255f6315..4c2c2a8239 100644 --- a/dashboard-ui/scripts/externalplayer.js +++ b/dashboard-ui/scripts/externalplayer.js @@ -249,10 +249,12 @@ }, 10000); + // Need a timeout because we can't show a popup at the same time as the previous one is closing + // Bumping it up to 1000 because the post play menu is hiding for some reason on android setTimeout(function () { showPostPlayMenu(currentItem); - }, 500); + }, 1000); } function onPlaybackProgress(positionTicks) { @@ -478,7 +480,6 @@ showMenu: showPlayMenu, onPlaybackStart: onPlaybackStart, - onPlaybackStopped: onPlaybackStopped, getExternalPlayers: getExternalPlayers, showPlayerSelectionMenu: showPlayerSelectionMenu }; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index c0ba7db776..afb1c332ce 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -4,9 +4,7 @@ var html = '
'; - if (AppInfo.enableBackButton) { - html += ''; - } + html += ''; html += '