mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
810b02170e
3 changed files with 1224 additions and 4 deletions
|
@ -73,6 +73,8 @@
|
||||||
$('#btnQueueMenu', page).hide();
|
$('#btnQueueMenu', page).hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(".autoNumeric").autoNumeric('init');
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -422,13 +424,13 @@
|
||||||
html += '<li><span class="mediaInfoLabel">Aspect Ratio</span> ' + stream.AspectRatio + '</li>';
|
html += '<li><span class="mediaInfoLabel">Aspect Ratio</span> ' + stream.AspectRatio + '</li>';
|
||||||
}
|
}
|
||||||
if (stream.BitRate) {
|
if (stream.BitRate) {
|
||||||
html += '<li><span class="mediaInfoLabel">Bitrate</span> ' + stream.BitRate + '</li>';
|
html += '<li><span class="mediaInfoLabel">Bitrate</span> <span class="autoNumeric">' + stream.BitRate + '</span></li>';
|
||||||
}
|
}
|
||||||
if (stream.Channels) {
|
if (stream.Channels) {
|
||||||
html += '<li><span class="mediaInfoLabel">Channels</span> ' + stream.Channels + '</li>';
|
html += '<li><span class="mediaInfoLabel">Channels</span> ' + stream.Channels + '</li>';
|
||||||
}
|
}
|
||||||
if (stream.SampleRate) {
|
if (stream.SampleRate) {
|
||||||
html += '<li><span class="mediaInfoLabel">Sample Rate</span> ' + stream.SampleRate + '</li>';
|
html += '<li><span class="mediaInfoLabel">Sample Rate</span> <span class="autoNumeric">' + stream.SampleRate + '</span></li>';
|
||||||
}
|
}
|
||||||
|
|
||||||
var framerate = stream.AverageFrameRate || stream.RealFrameRate;
|
var framerate = stream.AverageFrameRate || stream.RealFrameRate;
|
||||||
|
|
|
@ -1282,7 +1282,7 @@
|
||||||
|
|
||||||
renderBudget: function (elem, item) {
|
renderBudget: function (elem, item) {
|
||||||
if (item.Budget) {
|
if (item.Budget) {
|
||||||
elem.show().html('Budget: $' + item.Budget);
|
elem.show().html('Budget: $<span class="autoNumeric">' + item.Budget + '</span>');
|
||||||
} else {
|
} else {
|
||||||
elem.hide();
|
elem.hide();
|
||||||
}
|
}
|
||||||
|
@ -1290,7 +1290,7 @@
|
||||||
|
|
||||||
renderRevenue: function (elem, item) {
|
renderRevenue: function (elem, item) {
|
||||||
if (item.Revenue) {
|
if (item.Revenue) {
|
||||||
elem.show().html('Revenue: $' + item.Revenue);
|
elem.show().html('Revenue: $<span class="autoNumeric">' + item.Revenue + '</span>');
|
||||||
} else {
|
} else {
|
||||||
elem.hide();
|
elem.hide();
|
||||||
}
|
}
|
||||||
|
|
1218
dashboard-ui/thirdparty/autoNumeric.js
vendored
Normal file
1218
dashboard-ui/thirdparty/autoNumeric.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue