mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update guide

Browse source
This commit is contained in:
Luke Pulverenti 2017-01-08 00:52:51 -05:00
parent f5a9a7c6bf
commit e5119016fc
17 changed files with 202 additions and 95 deletions
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": {},
"ignore": [],
"version": "1.4.450",
"_release": "1.4.450",
"version": "1.4.451",
"_release": "1.4.451",
"_resolution": {
"type": "version",
"tag": "1.4.450",
"commit": "379047a56c13c7ad4136a86610af37060dc28912"
"tag": "1.4.451",
"commit": "521e1c545a373b8768307a3d895bf1544fcbefa5"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

44
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View file

@ -14,7 +14,7 @@
.guideHeaderDateSelection {
font-size: 86%;
padding: .4em 0;
padding: .4em 0 .2em;
}
.guideHeaderTimeslots {
@ -66,6 +66,8 @@
white-space: nowrap;
position: relative;
contain: strict;
box-sizing: border-box;
border-bottom: .2em solid #121212;
}
.timeslotHeadersInner {
@ -145,7 +147,7 @@
text-overflow: ellipsis;
border-right: 1px solid #121212;
width: 24vw;
background: rgba(40, 40, 40, .9);
background: rgb(38, 38, 38);
display: flex;
align-items: center;
text-decoration: none;
@ -196,7 +198,7 @@
}
.channelHeaderCell {
border-bottom: .25em solid #121212 !important;
border-bottom: .2em solid #121212 !important;
background-size: auto 70%;
background-position: 92% center;
background-repeat: no-repeat;
@ -209,15 +211,8 @@
}
}
@media all and (max-width: 1200px) {
.guideChannelNumberWithImage {
display: none;
}
}
.channelPrograms, .channelHeaderCell {
height: 4em;
height: 4.4em;
contain: strict;
}
@ -227,7 +222,7 @@
}
.channelPrograms-tv, .channelHeaderCell-tv {
height: 3.2em;
height: 3.8em;
}
.channelTimeslotHeader {
@ -254,10 +249,9 @@
.programCell {
position: absolute;
top: 0;
/* Unfortunately the borders using vh get rounded while the bottom property doesn't. So this is a little hack to try and make them even*/
bottom: .236em;
border-left: .25em solid #121212 !important;
background-color: rgba(32, 32, 32, .95);
bottom: 0;
border-left: .2em solid #121212 !important;
background-color: rgb(30, 30, 30);
display: flex;
text-decoration: none;
overflow: hidden;
@ -304,6 +298,20 @@
display: block;
}
.guideProgramNameText {
margin: 0;
font-weight: normal;
}
.guideProgramSecondaryInfo {
display: flex;
align-items: center;
}
.programSecondaryTitle {
opacity: .6;
}
.programIcon {
margin-left: auto;
margin-right: .25em;
@ -326,6 +334,8 @@
padding: .18em .32em;
border-radius: .25em;
margin-right: .35em;
width: auto;
height: auto;
}
.programTextIcon-tv {
@ -337,6 +347,8 @@
max-width: 30%;
text-overflow: ellipsis;
overflow: hidden;
font-weight: normal;
margin: 0;
}
.guideChannelName {

27
dashboard-ui/bower_components/emby-webcomponents/guide/guide.js vendored
View file

@ -512,20 +512,32 @@
html += '<div class="' + guideProgramNameClass + '">';
html += '<div class="guideProgramNameText">' + program.Name + '</div>';
var indicatorHtml;
if (program.IsLive && options.showLiveIndicator) {
html += '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#Live') + '</span>';
indicatorHtml = '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#Live') + '</span>';
}
else if (program.IsPremiere && options.showPremiereIndicator) {
html += '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#Premiere') + '</span>';
indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#Premiere') + '</span>';
}
else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
html += '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#AttributeNew') + '</span>';
indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#AttributeNew') + '</span>';
}
else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
html += '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#Repeat') + '</span>';
indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('sharedcomponents#Repeat') + '</span>';
}
if (indicatorHtml || program.EpisodeTitle) {
html += '<div class="guideProgramSecondaryInfo">';
html += indicatorHtml || '';
if (program.EpisodeTitle) {
html += '<span class="programSecondaryTitle">' + program.EpisodeTitle + '</span>';
}
html += '</div>';
}
html += program.Name;
html += '</div>';
if (program.IsHD && options.showHdIcon) {
@ -610,11 +622,8 @@
html += '<button type="button" class="' + cssClass + '"' + dataSrc + ' data-action="link" data-isfolder="' + channel.IsFolder + '" data-id="' + channel.Id + '" data-serverid="' + channel.ServerId + '" data-type="' + channel.Type + '">';
cssClass = 'guideChannelNumber';
if (hasChannelImage) {
cssClass += ' guideChannelNumberWithImage';
}
html += '<div class="' + cssClass + '">' + channel.Number + '</div>';
html += '<h3 class="' + cssClass + '">' + channel.Number + '</h3>';
if (!hasChannelImage) {
html += '<div class="guideChannelName">' + channel.Name + '</div>';

3
dashboard-ui/bower_components/emby-webcomponents/htmlvideoplayer/plugin.js vendored
View file

@ -1145,8 +1145,9 @@ define(['browser', 'pluginManager', 'events', 'apphost', 'loading', 'playbackMan
function createMediaElement(options) {
if (browser.tv || browser.noAnimation) {
if (browser.tv || browser.noAnimation || browser.iOS) {
// too slow
// also on iOS, the backdrop image doesn't look right
options.backdropUrl = null;
}
return new Promise(function (resolve, reject) {

40
dashboard-ui/bower_components/emby-webcomponents/sessionplayer.js vendored
View file

@ -1,9 +1,14 @@
define(['playbackManager', 'events', 'serverNotifications'], function (playbackManager, events, serverNotifications) {
'use strict';
function getActivePlayerId() {
var info = playbackManager.getPlayerInfo();
return info ? info.id : null;
}
function sendPlayCommand(options, playType) {
var sessionId = playbackManager.getPlayerInfo().id;
var sessionId = getActivePlayerId();
var ids = options.ids || options.items.map(function (i) {
return i.Id;
@ -24,12 +29,12 @@
function sendPlayStateCommand(command, options) {
var sessionId = playbackManager.getPlayerInfo().id;
var sessionId = getActivePlayerId();
ApiClient.sendPlayStateCommand(sessionId, command, options);
}
function RemoteControlPlayer() {
return function () {
var self = this;
@ -53,7 +58,7 @@
self.sendCommand = function (command) {
var sessionId = playbackManager.getPlayerInfo().id;
var sessionId = getActivePlayerId();
ApiClient.sendCommand(sessionId, command);
};
@ -61,7 +66,7 @@
self.play = function (options) {
var playOptions = {};
playOptions.ids = options.ids || options.items.map(function(i) {
playOptions.ids = options.ids || options.items.map(function (i) {
return i.Id;
});
@ -116,9 +121,9 @@
self.seek = function (positionTicks) {
sendPlayStateCommand('seek',
{
SeekPositionTicks: positionTicks
});
{
SeekPositionTicks: positionTicks
});
};
self.currentTime = function (val) {
@ -182,7 +187,7 @@
return [];
};
self.getAudioStreamIndex = function() {
self.getAudioStreamIndex = function () {
};
@ -262,7 +267,7 @@
if (apiClient) {
return apiClient.getSessions().then(function (sessions) {
var currentTargetId = playbackManager.getPlayerInfo().id;
var currentTargetId = getActivePlayerId();
// Update existing data
//updateSessionInfo(popup, msg.Data);
@ -381,7 +386,7 @@
}
};
self.tryPair = function(target) {
self.tryPair = function (target) {
return Promise.resolve();
};
@ -406,7 +411,7 @@
function processUpdatedSessions(sessions) {
var currentTargetId = playbackManager.getPlayerInfo().id;
var currentTargetId = getActivePlayerId();
// Update existing data
//updateSessionInfo(popup, msg.Data);
@ -415,6 +420,7 @@
})[0];
if (session) {
firePlaybackEvent('statechange', session);
firePlaybackEvent('timeupdate', session);
firePlaybackEvent('pause', session);
}
@ -427,14 +433,14 @@
events.on(serverNotifications, 'SessionEnded', function (e, apiClient, data) {
console.log("Server reports another session ended");
if (playbackManager.getPlayerInfo().id === data.Id) {
if (getActivePlayerId() === data.Id) {
playbackManager.setDefaultPlayerActive();
}
});
events.on(serverNotifications, 'PlaybackStart', function (e, apiClient, data) {
if (data.DeviceId !== apiClient.deviceId()) {
if (playbackManager.getPlayerInfo().id === data.Id) {
if (getActivePlayerId() === data.Id) {
firePlaybackEvent('playbackstart', data);
}
}
@ -442,12 +448,10 @@
events.on(serverNotifications, 'PlaybackStopped', function (e, apiClient, data) {
if (data.DeviceId !== apiClient.deviceId()) {
if (playbackManager.getPlayerInfo().id === data.Id) {
if (getActivePlayerId() === data.Id) {
firePlaybackEvent('playbackstop', data);
}
}
});
}
return RemoteControlPlayer;
};
});

2
dashboard-ui/bower_components/emby-webcomponents/strings/de.json vendored
View file

@ -377,5 +377,5 @@
"SyncJobItemStatusRemovedFromDevice": "Vom Ger\u00e4t entfernt",
"SyncJobItemStatusCancelled": "Abgebrochen",
"Retry": "Wiederholen",
"HeaderMyDevice": "My Device"
"HeaderMyDevice": "Mein Ger\u00e4t"
}

2
dashboard-ui/bower_components/emby-webcomponents/strings/pt-BR.json vendored
View file

@ -377,5 +377,5 @@
"SyncJobItemStatusRemovedFromDevice": "Removido do dispositivo",
"SyncJobItemStatusCancelled": "Cancelado",
"Retry": "Tentar Novamente",
"HeaderMyDevice": "My Device"
"HeaderMyDevice": "Meu Dispositivo"
}