cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update program display titles

Browse Source
This commit is contained in:
Luke Pulverenti 2017-01-22 16:09:16 -05:00
parent befa669bc5
commit 2e4314a278
6 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View File

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.480", "version": "1.4.481",
"_release": "1.4.480", "_release": "1.4.481",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.480", "tag": "1.4.481",
"commit": "20243f526641231c0e6911adc7d01fe1368dcc9e" "commit": "379634e39edbb1c464e99df15fa1dec0773053f4"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

3
dashboard-ui/bower_components/emby-webcomponents/listview/listview.css vendored
View File

@ -60,6 +60,9 @@
} }
.listItem-odd { .listItem-odd {
}
.listItem-shaded:nth-child(even) {
background: #1c1c1c; background: #1c1c1c;
} }

9
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View File

@ -206,9 +206,10 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var cssClass = "listItem"; var cssClass = "listItem";
if (options.highlight !== false) { if (options.highlight !== false) {
if (i % 2 === 1) { //if (i % 2 === 1) {
cssClass += ' listItem-odd'; // cssClass += ' listItem-odd';
} //}
cssClass += ' listItem-shaded';
} }
if (clickEntireItem) { if (clickEntireItem) {
@ -299,7 +300,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
parentTitle = item.SeriesName; parentTitle = item.SeriesName;
} }
else if (item.IsSeries) { else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
parentTitle = item.Name; parentTitle = item.Name;
} }
} }

16
dashboard-ui/bower_components/emby-webcomponents/playback/playbackmanager.js vendored
View File

@ -1554,7 +1554,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
} }
} }
function playInternal(item, playOptions, callback) { function playInternal(item, playOptions, onPlaybackStartedFn) {
if (item.IsPlaceHolder) { if (item.IsPlaceHolder) {
loading.hide(); loading.hide();
@ -1578,16 +1578,16 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
appSettings.maxStreamingBitrate(bitrate); appSettings.maxStreamingBitrate(bitrate);
return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions).then(callback); return playAfterBitrateDetect(connectionManager, bitrate, item, playOptions, onPlaybackStartedFn);
}, function () { }, function () {
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback); return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
}); });
} else { } else {
return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions).then(callback); return playAfterBitrateDetect(connectionManager, appSettings.maxStreamingBitrate(), item, playOptions, onPlaybackStartedFn);
} }
}, function () { }, function () {
@ -1647,7 +1647,7 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
}, reject); }, reject);
} }
function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions) { function playAfterBitrateDetect(connectionManager, maxBitrate, item, playOptions, onPlaybackStartedFn) {
var startPosition = playOptions.startPositionTicks; var startPosition = playOptions.startPositionTicks;
@ -1671,8 +1671,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
streamInfo.fullscreen = playOptions.fullscreen; streamInfo.fullscreen = playOptions.fullscreen;
getPlayerData(player).isChangingStream = false; getPlayerData(player).isChangingStream = false;
return player.play(streamInfo).then(function () { return player.play(streamInfo).then(function () {
onPlaybackStarted(player, streamInfo);
loading.hide(); loading.hide();
onPlaybackStartedFn();
onPlaybackStarted(player, streamInfo);
return Promise.resolve(); return Promise.resolve();
}); });
}); });
@ -1693,8 +1694,9 @@ define(['events', 'datetime', 'appSettings', 'pluginManager', 'userSettings', 'g
getPlayerData(player).maxStreamingBitrate = maxBitrate; getPlayerData(player).maxStreamingBitrate = maxBitrate;
return player.play(streamInfo).then(function () { return player.play(streamInfo).then(function () {
onPlaybackStarted(player, streamInfo, mediaSource);
loading.hide(); loading.hide();
onPlaybackStartedFn();
onPlaybackStarted(player, streamInfo, mediaSource);
return Promise.resolve(); return Promise.resolve();
}); });
}); });

14
dashboard-ui/components/remotecontrol.js
View File

@ -261,7 +261,6 @@
var currentRuntimeTicks = 0; var currentRuntimeTicks = 0;
var self = this; var self = this;
var playlistNeedsRefresh = true;
function toggleRepeat(player) { function toggleRepeat(player) {
@ -491,8 +490,6 @@
dragHandle: true dragHandle: true
}); });
playlistNeedsRefresh = false;
var itemsContainer = context.querySelector('.playlist'); var itemsContainer = context.querySelector('.playlist');
itemsContainer.innerHTML = html; itemsContainer.innerHTML = html;
@ -519,8 +516,6 @@
var player = this; var player = this;
onStateChanged.call(player, e, state); onStateChanged.call(player, e, state);
loadPlaylist(dlg, player);
} }
function onRepeatModeChange(e) { function onRepeatModeChange(e) {
@ -534,10 +529,7 @@
var player = this; var player = this;
playbackManager.getPlayerState(player).then(function (state) { loadPlaylist(dlg, player);
onStateChanged.call(player, { type: 'init' }, state);
});
} }
function onPlaylistItemRemoved(e, info) { function onPlaylistItemRemoved(e, info) {
@ -611,7 +603,7 @@
if (player) { if (player) {
events.off(player, 'playbackstart', onPlaybackStart); events.off(player, 'playbackstart', onPlaybackStart);
events.off(player, 'statechange', onPlaybackStart); events.off(player, 'statechange', onStateChanged);
events.off(player, 'repeatmodechange', onRepeatModeChange); events.off(player, 'repeatmodechange', onRepeatModeChange);
events.off(player, 'playlistitemremove', onPlaylistUpdate); events.off(player, 'playlistitemremove', onPlaylistUpdate);
events.off(player, 'playlistitemmove', onPlaylistUpdate); events.off(player, 'playlistitemmove', onPlaylistUpdate);
@ -641,7 +633,7 @@
}); });
events.on(player, 'playbackstart', onPlaybackStart); events.on(player, 'playbackstart', onPlaybackStart);
events.on(player, 'statechange', onPlaybackStart); events.on(player, 'statechange', onStateChanged);
events.on(player, 'repeatmodechange', onRepeatModeChange); events.on(player, 'repeatmodechange', onRepeatModeChange);
events.on(player, 'playlistitemremove', onPlaylistItemRemoved); events.on(player, 'playlistitemremove', onPlaylistItemRemoved);
events.on(player, 'playlistitemmove', onPlaylistUpdate); events.on(player, 'playlistitemmove', onPlaylistUpdate);

2
dashboard-ui/strings/en-US.json
View File

@ -317,7 +317,7 @@
"LabelFanartApiKey": "Personal api key:", "LabelFanartApiKey": "Personal api key:",
"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.", "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.",
"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.", "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.",
"LabelMetadataDownloadLanguage": "Preferred metadata download language:", "LabelMetadataDownloadLanguage": "Preferred metadata language:",
"ButtonSignIn": "Sign In", "ButtonSignIn": "Sign In",
"TitleSignIn": "Sign In", "TitleSignIn": "Sign In",
"HeaderPleaseSignIn": "Please sign in", "HeaderPleaseSignIn": "Please sign in",