Skip to content

Commit f5ed660

Browse files
update program display titles
1 parent 72130a8 commit f5ed660

File tree

8 files changed

+25
-27
lines changed

8 files changed

+25
-27
lines changed

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
},
1515
"devDependencies": {},
1616
"ignore": [],
17-
"version": "1.4.480",
18-
"_release": "1.4.480",
17+
"version": "1.4.481",
18+
"_release": "1.4.481",
1919
"_resolution": {
2020
"type": "version",
21-
"tag": "1.4.480",
22-
"commit": "20243f526641231c0e6911adc7d01fe1368dcc9e"
21+
"tag": "1.4.481",
22+
"commit": "379634e39edbb1c464e99df15fa1dec0773053f4"
2323
},
2424
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
2525
"_target": "^1.2.1",

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/listview/listview.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@
6060
}
6161

6262
.listItem-odd {
63+
}
64+
65+
.listItem-shaded:nth-child(even) {
6366
background: #1c1c1c;
6467
}
6568

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,10 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
206206
var cssClass = "listItem";
207207

208208
if (options.highlight !== false) {
209-
if (i % 2 === 1) {
210-
cssClass += ' listItem-odd';
211-
}
209+
//if (i % 2 === 1) {
210+
// cssClass += ' listItem-odd';
211+
//}
212+
cssClass += ' listItem-shaded';
212213
}
213214

214215
if (clickEntireItem) {
@@ -299,7 +300,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
299300
parentTitle = item.SeriesName;
300301
}
301302

302-
else if (item.IsSeries) {
303+
else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
303304
parentTitle = item.Name;
304305
}
305306
}

MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,7 +1554,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
15541554
}
15551555
}
15561556

1557-
function playInternal(item, playOptions, callback) {
1557+
function playInternal(item, playOptions, onPlaybackStartedFn) {
15581558

15591559
if (item.IsPlaceHolder) {
15601560
loading.hide();
@@ -1578,16 +1578,16 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
15781578

15791579
appSettings.maxStreamingBitrate(bitrate);
15801580

1581-
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions).then(callback);
1581+
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions, onPlaybackStartedFn);
15821582

15831583
}, function () {
15841584

1585-
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback);
1585+
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
15861586
});
15871587

15881588
} else {
15891589

1590-
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback);
1590+
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
15911591
}
15921592

15931593
}, function () {
@@ -1647,7 +1647,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
16471647
}, reject);
16481648
}
16491649

1650-
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions) {
1650+
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions, onPlaybackStartedFn) {
16511651

16521652
var startPosition = playOptions.startPositionTicks;
16531653

@@ -1671,8 +1671,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
16711671
streamInfo.fullscreen = playOptions.fullscreen;
16721672
getPlayerData(player).isChangingStream = false;
16731673
return player.play(streamInfo).then(function () {
1674-
onPlaybackStarted(player, streamInfo);
16751674
loading.hide();
1675+
onPlaybackStartedFn();
1676+
onPlaybackStarted(player, streamInfo);
16761677
return Promise.resolve();
16771678
});
16781679
});
@@ -1693,8 +1694,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
16931694
getPlayerData(player).maxStreamingBitrate = maxBitrate;
16941695

16951696
return player.play(streamInfo).then(function () {
1696-
onPlaybackStarted(player, streamInfo, mediaSource);
16971697
loading.hide();
1698+
onPlaybackStartedFn();
1699+
onPlaybackStarted(player, streamInfo, mediaSource);
16981700
return Promise.resolve();
16991701
});
17001702
});

MediaBrowser.WebDashboard/dashboard-ui/components/remotecontrol.js

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@
261261
var currentRuntimeTicks = 0;
262262

263263
var self = this;
264-
var playlistNeedsRefresh = true;
265264

266265
function toggleRepeat(player) {
267266

@@ -491,8 +490,6 @@
491490
dragHandle: true
492491
});
493492

494-
playlistNeedsRefresh = false;
495-
496493
var itemsContainer = context.querySelector('.playlist');
497494

498495
itemsContainer.innerHTML = html;
@@ -519,8 +516,6 @@
519516

520517
var player = this;
521518
onStateChanged.call(player, e, state);
522-
523-
loadPlaylist(dlg, player);
524519
}
525520

526521
function onRepeatModeChange(e) {
@@ -534,10 +529,7 @@
534529

535530
var player = this;
536531

537-
playbackManager.getPlayerState(player).then(function (state) {
538-
539-
onStateChanged.call(player, { type: 'init' }, state);
540-
});
532+
loadPlaylist(dlg, player);
541533
}
542534

543535
function onPlaylistItemRemoved(e, info) {
@@ -611,7 +603,7 @@
611603
if (player) {
612604

613605
events.off(player, 'playbackstart', onPlaybackStart);
614-
events.off(player, 'statechange', onPlaybackStart);
606+
events.off(player, 'statechange', onStateChanged);
615607
events.off(player, 'repeatmodechange', onRepeatModeChange);
616608
events.off(player, 'playlistitemremove', onPlaylistUpdate);
617609
events.off(player, 'playlistitemmove', onPlaylistUpdate);
@@ -641,7 +633,7 @@
641633
});
642634

643635
events.on(player, 'playbackstart', onPlaybackStart);
644-
events.on(player, 'statechange', onPlaybackStart);
636+
events.on(player, 'statechange', onStateChanged);
645637
events.on(player, 'repeatmodechange', onRepeatModeChange);
646638
events.on(player, 'playlistitemremove', onPlaylistItemRemoved);
647639
events.on(player, 'playlistitemmove', onPlaylistUpdate);

MediaBrowser.WebDashboard/dashboard-ui/strings/en-US.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
"LabelFanartApiKey": "Personal api key:",
318318
"LabelFanartApiKeyHelp": "Requests to fanart without a personal API key return images that were approved over 7 days ago. With a personal API key that drops to 48 hours and if you are also a fanart VIP member that will further drop to around 10 minutes.",
319319
"ExtractChapterImagesHelp": "Extracting chapter images will allow Emby apps to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs when videos are discovered, and also as a nightly scheduled task. The schedule is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
320-
"LabelMetadataDownloadLanguage": "Preferred metadata download language:",
320+
"LabelMetadataDownloadLanguage": "Preferred metadata language:",
321321
"ButtonSignIn": "Sign In",
322322
"TitleSignIn": "Sign In",
323323
"HeaderPleaseSignIn": "Please sign in",
-11.7 KB
Binary file not shown.
-11.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)