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 SocketHttpListener

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-06 15:56:35 -04:00
parent a8a609a04d
commit 0129027afa
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,8 @@ button.listItem {
line-height: 160%; line-height: 160%;
border-bottom: 1px solid #2a2a2a; border-bottom: 1px solid #2a2a2a;
cursor: pointer; cursor: pointer;
white-space: nowrap;
overflow: hidden;
} }
.listItem-nosidepadding { .listItem-nosidepadding {

2
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View File

@ -165,7 +165,7 @@
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<h2 class="dialogHeader">';
html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>'; html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + options.library.Name + '</div>'; html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + options.library.Name + '</div>';
html += '</h2>'; html += '</h2>';

35
dashboard-ui/scripts/dashboardpage.js
View File

@ -427,6 +427,7 @@
//html += '<div>'; //html += '<div>';
var showTranscodingInfo = false; var showTranscodingInfo = false;
if (session.TranscodingInfo && session.TranscodingInfo.IsAudioDirect && session.TranscodingInfo.IsVideoDirect) { if (session.TranscodingInfo && session.TranscodingInfo.IsAudioDirect && session.TranscodingInfo.IsVideoDirect) {
html += Globalize.translate('LabelPlayMethodDirectStream'); html += Globalize.translate('LabelPlayMethodDirectStream');
} }
@ -455,28 +456,30 @@
var line = []; var line = [];
if (session.TranscodingInfo.Bitrate) { if (session.TranscodingInfo) {
if (session.TranscodingInfo.Bitrate) {
if (session.TranscodingInfo.Bitrate > 1000000) { if (session.TranscodingInfo.Bitrate > 1000000) {
line.push((session.TranscodingInfo.Bitrate / 1000000).toFixed(1) + ' Mbps'); line.push((session.TranscodingInfo.Bitrate / 1000000).toFixed(1) + ' Mbps');
} else { } else {
line.push(Math.floor(session.TranscodingInfo.Bitrate / 1000) + ' kbps'); line.push(Math.floor(session.TranscodingInfo.Bitrate / 1000) + ' kbps');
}
} }
} if (session.TranscodingInfo.Container) {
if (session.TranscodingInfo.Container) {
line.push(session.TranscodingInfo.Container); line.push(session.TranscodingInfo.Container);
} }
if (session.TranscodingInfo.VideoCodec) { if (session.TranscodingInfo.VideoCodec) {
//line.push(Globalize.translate('LabelVideoCodec').replace('{0}', session.TranscodingInfo.VideoCodec)); //line.push(Globalize.translate('LabelVideoCodec').replace('{0}', session.TranscodingInfo.VideoCodec));
line.push(session.TranscodingInfo.VideoCodec); line.push(session.TranscodingInfo.VideoCodec);
} }
if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) { if (session.TranscodingInfo.AudioCodec && session.TranscodingInfo.AudioCodec != session.TranscodingInfo.Container) {
//line.push(Globalize.translate('LabelAudioCodec').replace('{0}', session.TranscodingInfo.AudioCodec)); //line.push(Globalize.translate('LabelAudioCodec').replace('{0}', session.TranscodingInfo.AudioCodec));
line.push(session.TranscodingInfo.AudioCodec); line.push(session.TranscodingInfo.AudioCodec);
}
} }
if (line.length) { if (line.length) {