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 lists

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-03 02:28:45 -04:00
parent 6f73ce4cc3
commit c2290dd41d
33 changed files with 540 additions and 627 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.281",
"_release": "1.4.281",
"version": "1.4.283",
"_release": "1.4.283",
"_resolution": {
"type": "version",
"tag": "1.4.281",
"commit": "6f766fd6733ce492387abd5d6f339983085f2359"
"tag": "1.4.283",
"commit": "52a82ab789f4650d3b0ab7ee41cba96d417cfa76"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

9
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -558,6 +558,15 @@ define(['browser'], function (browser) {
}]
});
if (browser.chrome) {
profile.CodecProfiles[profile.CodecProfiles.length - 1].Conditions.push({
Condition: 'NotEquals',
Property: 'IsAVC',
Value: 'false',
IsRequired: false
});
}
profile.CodecProfiles.push({
Type: 'Video',
Codec: 'vpx',

21
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -761,6 +761,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
var lines = [];
var parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo';
var titleAdded;
if (showOtherText) {
if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) {
@ -776,20 +777,30 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
else {
var parentTitle = item.Type === 'Program' ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "");
if (item.Type === 'Program') {
if (parentTitle || options.showParentTitle) {
lines.push(parentTitle);
lines.push(item.Name);
if (!item.IsSeries) {
titleAdded = true;
}
} else {
var parentTitle = item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "";
if (parentTitle || options.showParentTitle) {
lines.push(parentTitle);
}
}
}
}
}
if (showTitle || forceName || (options.showParentTitleOrTitle && !lines.length)) {
if (((showTitle || forceName) && !titleAdded) || (options.showParentTitleOrTitle && !lines.length)) {
var name = options.showTitle === 'auto' && !item.IsFolder && item.MediaType === 'Photo' ? '' : itemHelper.getDisplayName(item);
lines.push(htmlEncode(name));
lines.push(name);
}
if (showOtherText) {

38
dashboard-ui/bower_components/emby-webcomponents/datetime.js vendored
View file

@ -131,8 +131,8 @@
var currentLocale = getCurrentLocale();
return currentLocale && toLocaleTimeStringSupportsLocales ?
date.toLocaleTimeString(currentLocale, options || {}) :
date.toLocaleTimeString();
date.toLocaleTimeString(currentLocale, options || {}).toLowerCase() :
date.toLocaleTimeString().toLowerCase();
}
function getDisplayTime(date) {
@ -147,38 +147,12 @@
}
}
var time = toLocaleTimeString(date);
return toLocaleTimeString(date, {
var timeLower = time.toLowerCase();
hour: 'numeric',
minute: '2-digit'
if (timeLower.indexOf('am') != -1 || timeLower.indexOf('pm') != -1) {
time = timeLower;
var hour = date.getHours() % 12;
var suffix = date.getHours() > 11 ? 'pm' : 'am';
if (!hour) {
hour = 12;
}
var minutes = date.getMinutes();
if (minutes < 10) {
minutes = '0' + minutes;
}
minutes = ':' + minutes;
time = hour + minutes + suffix;
} else {
var timeParts = time.split(':');
// Trim off seconds
if (timeParts.length > 2) {
timeParts.length -= 1;
time = timeParts.join(':');
}
}
return time;
});
}
function isRelativeDay(date, offsetInDays) {

2
dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js vendored
View file

@ -131,7 +131,7 @@
animateDialogOpen(dlg);
if (isHistoryEnabled(dlg)) {
historyManager.pushState({ dialogId: hash }, "Dialog", hash);
historyManager.pushState({ dialogId: hash }, "Dialog", '#' + hash);
window.addEventListener('popstate', onHashChange);
} else {

2
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -152,7 +152,7 @@
.paper-icon-button-light > i {
width: auto;
height: auto;
font-size: 1.72em;
font-size: 1.6em;
/* Make sure its on top of the ripple */
position: relative;
z-index: 1;

2
dashboard-ui/bower_components/emby-webcomponents/emby-input/emby-input.css vendored
View file

@ -3,7 +3,7 @@
margin: 0;
margin-bottom: 0 !important;
background: none;
border: 1px solid rgb(221, 221, 221);
border: 1px solid #383838;
border-width: 0 0 1px 0;
/* Prefixed box-sizing rules necessary for older browsers */
-webkit-box-sizing: border-box;

2
dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.css vendored
View file

@ -3,7 +3,7 @@
margin: 0;
margin-bottom: 0 !important;
background: none;
border: 1px solid rgb(221, 221, 221);
border: 1px solid #383838;
border-width: 0 0 1px 0;
/* Prefixed box-sizing rules necessary for older browsers */
-webkit-box-sizing: border-box;

2
dashboard-ui/bower_components/emby-webcomponents/emby-textarea/emby-textarea.css vendored
View file

@ -3,7 +3,7 @@
margin: 0;
margin-bottom: 0 !important;
background: none;
border: 1px solid rgb(221, 221, 221);
border: 1px solid #383838;
border-width: 0 0 1px 0;
/* Prefixed box-sizing rules necessary for older browsers */
-webkit-box-sizing: border-box;

24
dashboard-ui/bower_components/emby-webcomponents/listview/listview.css vendored
View file

@ -15,10 +15,6 @@
overflow: hidden;
}
.listItem-border {
border-bottom: 1px solid #262626;
}
.listItem-button {
width: 100%;
}
@ -63,24 +59,8 @@
justify-content: center;
}
.listItemBody-nogrow {
flex-grow: initial;
flex-shrink: 0;
width: 9em;
opacity: .7;
}
@media all and (max-width: 800px) {
.listItemBody-nogrow {
width: 4em;
}
}
.two-line {
min-height: 5.15em;
padding-top: 0;
padding-bottom: 0;
.listItem-odd {
background: #171717;
}
.three-line {

81
dashboard-ui/bower_components/emby-webcomponents/listview/listview.js vendored
View file

@ -180,8 +180,10 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var cssClass = "listItem listItem-nosidepadding";
if (options.border !== false) {
cssClass += ' listItem-border';
if (options.highlight !== false) {
if (i % 2 == 1) {
cssClass += ' listItem-odd';
}
}
if (clickEntireItem) {
@ -242,21 +244,32 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '</div>';
}
if (options.showProgramTimeColumn) {
html += '<div class="listItemBody listItemBody-nogrow listItemBody-rightborder"><div class="listItemBodyText">';
html += datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate));
html += '</div></div>';
var textlines = [];
if (options.showProgramDateTime) {
textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.StartDate), {
weekday: 'long',
month: 'short',
day: 'numeric',
hour: 'numeric',
minute: '2-digit'
}));
}
var textlines = [];
if (options.showProgramTime) {
textlines.push(datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate)));
}
var parentTitle;
if (options.showParentTitle) {
if (item.Type == 'Episode') {
textlines.push(item.SeriesName || '&nbsp;');
parentTitle = item.SeriesName;
}
if (item.IsSeries) {
textlines.push(item.Name || '&nbsp;');
else if (item.IsSeries) {
parentTitle = item.Name;
}
}
@ -265,7 +278,20 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
if (options.showIndexNumber && item.IndexNumber != null) {
displayName = item.IndexNumber + ". " + displayName;
}
if (displayName) {
if (options.showParentTitle && options.parentTitleWithTitle) {
if (parentTitle && displayName) {
parentTitle += ' - ' + displayName;
}
textlines.push(parentTitle || '&nbsp;');
}
else if (options.showParentTitle) {
textlines.push(parentTitle || '&nbsp;');
}
if (displayName && !options.parentTitleWithTitle) {
textlines.push(displayName);
}
@ -302,14 +328,16 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += getTextLinesHtml(textlines, isLargeStyle);
if (!enableSideMediaInfo) {
if (options.mediaInfo !== false) {
if (!enableSideMediaInfo) {
var mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
var mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
html += '<div class="' + mediaInfoClass + '">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
episodeTitle: false,
originalAirDate: false
}) + '</div>';
html += '<div class="' + mediaInfoClass + '">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
episodeTitle: false,
originalAirDate: false
}) + '</div>';
}
}
if (enableOverview && item.Overview) {
@ -320,18 +348,23 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '</div>';
if (enableSideMediaInfo) {
html += '<div class="secondary listItemMediaInfo">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
if (options.mediaInfo !== false) {
if (enableSideMediaInfo) {
html += '<div class="secondary listItemMediaInfo">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
year: false,
container: false,
episodeTitle: false
year: false,
container: false,
episodeTitle: false
}) + '</div>';
}) + '</div>';
}
}
if (!clickEntireItem) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction autoSize" data-action="menu"><i class="md-icon">' + moreIcon + '</i></button>';
if (options.moreButton !== false) {
html += '<button is="paper-icon-button-light" class="listItemButton itemAction autoSize" data-action="menu"><i class="md-icon">' + moreIcon + '</i></button>';
}
if (options.enableUserDataButtons !== false) {
html += '<span class="listViewUserDataButtons">';

10
dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmenu.js vendored
View file

@ -16,12 +16,12 @@
html += '<div class="ssk-group ssk-round ssk-lg">';
// We can only do facebook if we can guarantee that the current page is available over the internet, since FB will try to probe it.
html += '<a href="#" class="ssk ssk-facebook"></a>';
html += '<a href="#" class="ssk ssk-facebook" style="color:#fff;"></a>';
html += '<a href="#" class="ssk ssk-twitter"></a>';
html += '<a href="#" class="ssk ssk-google-plus"></a>';
html += '<a href="#" class="ssk ssk-pinterest"></a>';
html += '<a href="#" class="ssk ssk-tumblr"></a>';
html += '<a href="#" class="ssk ssk-twitter" style="color:#fff;"></a>';
html += '<a href="#" class="ssk ssk-google-plus" style="color:#fff;"></a>';
html += '<a href="#" class="ssk ssk-pinterest" style="color:#fff;"></a>';
html += '<a href="#" class="ssk ssk-tumblr" style="color:#fff;"></a>';
html += '</div>';
dlg.style['padding'] = '.5em 1.5em 1.5em';