From 8a5cd4b491e5f63084b42a542f70a92260095054 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 28 Apr 2014 23:56:20 -0400 Subject: [PATCH] 3.0.5231.40980 --- dashboard-ui/css/site.css | 9 ++++++-- dashboard-ui/dashboard.html | 2 +- dashboard-ui/dlnaprofile.html | 2 +- dashboard-ui/nowplaying.html | 18 +++++++-------- dashboard-ui/scripts/chromecast.js | 18 +++++++-------- dashboard-ui/scripts/librarymenu.js | 2 +- dashboard-ui/scripts/movies.js | 3 +-- dashboard-ui/scripts/nowplayingbar.js | 2 +- dashboard-ui/scripts/nowplayingpage.js | 22 +++++++++---------- dashboard-ui/scripts/remotecontrol.js | 22 ++++++++++++++----- dashboard-ui/scripts/usersettings.js | 3 +++ .../thirdparty/mediabrowser.apiclient.js | 2 ++ dashboard-ui/usersettings.html | 5 +++++ 13 files changed, 68 insertions(+), 42 deletions(-) diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 5d6e1e59b8..987c3a530c 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -856,7 +856,7 @@ progress { .activeSession { display: inline-block; position: relative; - margin: 5px; + margin: 4px; width: 275px; height: 154.6875px; } @@ -934,13 +934,18 @@ progress { z-index: 1000; } +.activeDevicesCollapsible .ui-collapsible-content { + padding: .25em!important; +} + .activeSession:not(.playingSession) .sessionNowPlayingContent { display: none; } .activeSession:not(.playingSession) .sessionNowPlayingInnerContent { - background-color: #f0f0f0; + background-color: #fff; color: #000; + border: 1px solid #ddd; } .activeSession:not(.playingSession) .sessionUserInfo, .activeSession:not(.playingSession) .sessionNowPlayingInfo { diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index d87659b2eb..21d7323c2e 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -60,7 +60,7 @@ -
+

${HeaderActiveDevices}

diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html index 8d429c6ecb..c0b3cb3724 100644 --- a/dashboard-ui/dlnaprofile.html +++ b/dashboard-ui/dlnaprofile.html @@ -150,7 +150,7 @@
  • - +
  • diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index 633ec7e29a..bbb33a9aae 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -20,17 +20,17 @@
    - - - - - + + + + +
    - - - - + + + +
    diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index ed6729e867..882aa32d8f 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -587,7 +587,7 @@ this.timer = setInterval(this.incrementMediaTimeHandler, this.timerStep); }; - var castPlayer = new CastPlayer(); + //var castPlayer = new CastPlayer(); function getCodecLimits() { @@ -1477,16 +1477,16 @@ }; } - MediaController.registerPlayer(new chromecastPlayer()); + //MediaController.registerPlayer(new chromecastPlayer()); - $(MediaController).on('playerchange', function () { + //$(MediaController).on('playerchange', function () { - if (MediaController.getPlayerInfo().name == PlayerName) { + // if (MediaController.getPlayerInfo().name == PlayerName) { - if (castPlayer.deviceState != DEVICE_STATE.ACTIVE && castPlayer.isInitialized) { - castPlayer.launchApp(); - } - } - }); + // if (castPlayer.deviceState != DEVICE_STATE.ACTIVE && castPlayer.isInitialized) { + // castPlayer.launchApp(); + // } + // } + //}); })(window, window.chrome, console); \ No newline at end of file diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 3efbfae9d5..137888046e 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -16,7 +16,7 @@ html += ''; - html += 'Remote Control'; + html += ''; if (user.Configuration.IsAdministrator) { html += 'Metadata Manager'; diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index e3d2689c8d..b318a8c96f 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -10,8 +10,7 @@ IncludeItemTypes: "Movie", Recursive: true, Fields: "PrimaryImageAspectRatio", - StartIndex: 0, - CollapseBoxSetItems: true + StartIndex: 0 }; function reloadItems(page) { diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js index 2d18c829f2..b7d00a9eba 100644 --- a/dashboard-ui/scripts/nowplayingbar.js +++ b/dashboard-ui/scripts/nowplayingbar.js @@ -388,7 +388,7 @@ player.getPlayerState().done(function (state) { - if (state.itemName) { + if (state.NowPlayingItem) { player.beginPlayerUpdates(); } diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index d25fe0e8d7..f79f1da4b0 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -89,9 +89,9 @@ $('.btnToggleFullscreen', page).buttonEnabled(item && item.MediaType == 'Video' && supportedCommands.indexOf('ToggleFullscreen') != -1); - $('.btnAudioTracks', page).buttonEnabled(item != null); - $('.btnSubtitles', page).buttonEnabled(item != null); - $('.btnChapters', page).buttonEnabled(item != null); + $('.btnAudioTracks', page).buttonEnabled(false); + $('.btnSubtitles', page).buttonEnabled(false); + $('.btnChapters', page).buttonEnabled(false); $('.btnStop', page).buttonEnabled(item != null); $('.btnNextTrack', page).buttonEnabled(item != null); @@ -142,7 +142,7 @@ player.getPlayerState().done(function (state) { - if (state.itemName) { + if (state.NowPlayingItem) { player.beginPlayerUpdates(); } @@ -168,6 +168,13 @@ bindEvents(page); + }).on('pageshow', "#nowPlayingPage", function () { + + var page = this; + + $('.radioTabButton', page).checked(false).checkboxradio('refresh'); + $('.radioTabButton:first', page).checked(true).checkboxradio('refresh').trigger('change'); + $(function () { $(MediaController).on('playerchange.nowplayingpage', function () { @@ -179,13 +186,6 @@ }); - }).on('pageshow', "#nowPlayingPage", function () { - - var page = this; - - $('.radioTabButton', page).checked(false).checkboxradio('refresh'); - $('.radioTabButton:first', page).checked(true).checkboxradio('refresh').trigger('change'); - }).on('pagehide', "#nowPlayingPage", function () { releaseCurrentPlayer(); diff --git a/dashboard-ui/scripts/remotecontrol.js b/dashboard-ui/scripts/remotecontrol.js index 82a1ed0ed2..7380197220 100644 --- a/dashboard-ui/scripts/remotecontrol.js +++ b/dashboard-ui/scripts/remotecontrol.js @@ -167,16 +167,20 @@ return deferred.promise(); }; - function subscribeToPlayerUpdates() { + self.subscribeToPlayerUpdates = function () { + + self.isUpdating = true; if (ApiClient.isWebSocketOpen()) { - ApiClient.sendWebSocketMessage("SessionsStart", "100,700"); + ApiClient.sendWebSocketMessage("SessionsStart", "100,900"); } - } + }; function unsubscribeFromPlayerUpdates() { + self.false = true; + if (ApiClient.isWebSocketOpen()) { ApiClient.sendWebSocketMessage("SessionsStop"); @@ -190,7 +194,7 @@ playerListenerCount = 0; - subscribeToPlayerUpdates(); + self.subscribeToPlayerUpdates(); } playerListenerCount++; @@ -259,6 +263,14 @@ $(player).trigger(name, [getPlayerState(session)]); } + function onWebSocketConnectionChange() { + + // Reconnect + if (player.isUpdating) { + player.subscribeToPlayerUpdates(); + } + } + function onWebSocketMessageReceived(e, msg) { if (msg.MessageType === "Sessions") { @@ -291,6 +303,6 @@ } } - $(ApiClient).on("websocketmessage", onWebSocketMessageReceived); + $(ApiClient).on("websocketmessage", onWebSocketMessageReceived).on("websocketopen", onWebSocketConnectionChange); })(window, document, jQuery); \ No newline at end of file diff --git a/dashboard-ui/scripts/usersettings.js b/dashboard-ui/scripts/usersettings.js index cb089ead1b..c4a835c9aa 100644 --- a/dashboard-ui/scripts/usersettings.js +++ b/dashboard-ui/scripts/usersettings.js @@ -33,6 +33,8 @@ $('#chkDisplayMissingEpisodes', page).checked(user.Configuration.DisplayMissingEpisodes || false).checkboxradio("refresh"); $('#chkDisplayUnairedEpisodes', page).checked(user.Configuration.DisplayUnairedEpisodes || false).checkboxradio("refresh"); + $('#chkGroupMoviesIntoCollections', page).checked(user.Configuration.GroupMoviesIntoBoxSets || false).checkboxradio("refresh"); + Dashboard.hideLoadingMsg(); } @@ -58,6 +60,7 @@ user.Configuration.UseForcedSubtitlesOnly = $('#chkForcedSubtitlesOnly', page).checked(); user.Configuration.DisplayMissingEpisodes = $('#chkDisplayMissingEpisodes', page).checked(); user.Configuration.DisplayUnairedEpisodes = $('#chkDisplayUnairedEpisodes', page).checked(); + user.Configuration.GroupMoviesIntoBoxSets = $('#chkGroupMoviesIntoCollections', page).checked(); ApiClient.updateUser(user).done(function () { onSaveComplete(page); diff --git a/dashboard-ui/thirdparty/mediabrowser.apiclient.js b/dashboard-ui/thirdparty/mediabrowser.apiclient.js index d99a1040e3..adab495171 100644 --- a/dashboard-ui/thirdparty/mediabrowser.apiclient.js +++ b/dashboard-ui/thirdparty/mediabrowser.apiclient.js @@ -182,6 +182,8 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi self.sendWebSocketMessage = function (name, data) { + console.log('Sending web socket message: ' + name); + var msg = { MessageType: name }; if (data) { diff --git a/dashboard-ui/usersettings.html b/dashboard-ui/usersettings.html index d182a787e7..6bea460429 100644 --- a/dashboard-ui/usersettings.html +++ b/dashboard-ui/usersettings.html @@ -25,6 +25,11 @@
+
+ + +
${LabelGroupMoviesIntoCollectionsHelp}
+

${HeaderVideoPlaybackSettings}