mirror of
https://github.com/jellyfin/jellyfin-web.git
synced 2024-11-18 03:18:19 -07:00
update to service stack 3.0.70.0
This commit is contained in:
parent
dbf7337f7c
commit
7e5011f03d
@ -32,7 +32,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="updateFail" style="color: #cc0000; display: none;">There was an error connecting to the remote Media Browser repository.</div>
|
<div id="updateFail" style="color: #cc0000; display: none;">There was an error connecting to the remote Media Browser repository.</div>
|
||||||
<p id="ports"></p>
|
<p id="ports"></p>
|
||||||
<p>Program data path: <span id="programDataPath"></span></p>
|
|
||||||
<div id="pPluginUpdates"></div>
|
<div id="pPluginUpdates"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -74,7 +73,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em;">
|
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 1em;">
|
||||||
<h3>Links</h3>
|
<h3>Links</h3>
|
||||||
<div>
|
<div>
|
||||||
<p><a href="http://mediabrowser3.com/community" target="_blank">Community</a></p>
|
<p><a href="http://mediabrowser3.com/community" target="_blank">Community</a></p>
|
||||||
@ -84,6 +83,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 1em;">
|
||||||
|
<h3>System Paths</h3>
|
||||||
|
<div>
|
||||||
|
<p><b>Logs:</b> <span id="logPath"></span></p>
|
||||||
|
<p><b>Images by name:</b> <span id="imagesByNamePath"></span></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div style="display: none; margin-top: 4em;" id="contribute">
|
<div style="display: none; margin-top: 4em;" id="contribute">
|
||||||
<h3 style="padding-left: 1em;">Help improve Media Browser</h3>
|
<h3 style="padding-left: 1em;">Help improve Media Browser</h3>
|
||||||
<form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr"
|
<form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr"
|
||||||
|
@ -15,6 +15,9 @@
|
|||||||
<a href="supporterkey.html" data-role="button">Supporter Key</a>
|
<a href="supporterkey.html" data-role="button">Supporter Key</a>
|
||||||
<a href="about.html" data-role="button">About</a>
|
<a href="about.html" data-role="button">About</a>
|
||||||
</div>
|
</div>
|
||||||
|
<p>
|
||||||
|
Log path: <span id="logPath"></span>
|
||||||
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<label for="chkAutoScroll">Auto-scroll</label>
|
<label for="chkAutoScroll">Auto-scroll</label>
|
||||||
<input type="checkbox" id="chkAutoScroll" onchange="LogPage.updateAutoScroll(this.checked);" name="chkAutoScroll" data-inline="true" />
|
<input type="checkbox" id="chkAutoScroll" onchange="LogPage.updateAutoScroll(this.checked);" name="chkAutoScroll" data-inline="true" />
|
||||||
|
@ -326,7 +326,8 @@
|
|||||||
$('#ports', page).html('Running on ports <b>' + port + '</b> and <b>' + dashboardInfo.SystemInfo.WebSocketPortNumber + '</b>');
|
$('#ports', page).html('Running on ports <b>' + port + '</b> and <b>' + dashboardInfo.SystemInfo.WebSocketPortNumber + '</b>');
|
||||||
}
|
}
|
||||||
|
|
||||||
$('#programDataPath', page).html(dashboardInfo.SystemInfo.ProgramDataPath);
|
$('#logPath', page).html(dashboardInfo.SystemInfo.LogPath);
|
||||||
|
$('#imagesByNamePath', page).html(dashboardInfo.SystemInfo.ItemsByNamePath);
|
||||||
|
|
||||||
var host = ApiClient.serverHostName();
|
var host = ApiClient.serverHostName();
|
||||||
|
|
||||||
|
@ -2,9 +2,11 @@
|
|||||||
|
|
||||||
onPageShow: function () {
|
onPageShow: function () {
|
||||||
|
|
||||||
|
var page = this;
|
||||||
|
|
||||||
LogPage.startLine = 0;
|
LogPage.startLine = 0;
|
||||||
|
|
||||||
$('#logContents', this).html('');
|
$('#logContents', page).html('');
|
||||||
|
|
||||||
$(ApiClient).on("websocketmessage", LogPage.onWebSocketMessage).on("websocketopen", LogPage.onWebSocketConnectionChange).on("websocketerror", LogPage.onWebSocketConnectionChange).on("websocketclose", LogPage.onWebSocketConnectionChange);
|
$(ApiClient).on("websocketmessage", LogPage.onWebSocketMessage).on("websocketopen", LogPage.onWebSocketConnectionChange).on("websocketerror", LogPage.onWebSocketConnectionChange).on("websocketclose", LogPage.onWebSocketConnectionChange);
|
||||||
|
|
||||||
@ -18,6 +20,12 @@
|
|||||||
else if (autoScroll == "false") {
|
else if (autoScroll == "false") {
|
||||||
LogPage.updateAutoScroll(false);
|
LogPage.updateAutoScroll(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ApiClient.getSystemInfo().done(function(systemInfo) {
|
||||||
|
|
||||||
|
$('#logPath', page).html(systemInfo.LogPath);
|
||||||
|
|
||||||
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
onPageHide: function () {
|
onPageHide: function () {
|
||||||
|
@ -503,20 +503,6 @@
|
|||||||
var h264Codec = 'h264';
|
var h264Codec = 'h264';
|
||||||
var h264AudioCodec = 'aac';
|
var h264AudioCodec = 'aac';
|
||||||
|
|
||||||
if (videoStream && videoStream.Width && videoStream.Width <= baseParams.maxWidth) {
|
|
||||||
|
|
||||||
var videoCodec = (videoStream.Codec || '').toLowerCase();
|
|
||||||
|
|
||||||
if (videoCodec.indexOf('h264') != -1 &&
|
|
||||||
videoStream.Width &&
|
|
||||||
videoStream.Width <= 1280 &&
|
|
||||||
videoStream.BitRate &&
|
|
||||||
videoStream.BitRate <= 2000000) {
|
|
||||||
|
|
||||||
//h264Codec = 'copy';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (startPosition) {
|
if (startPosition) {
|
||||||
baseParams.StartTimeTicks = startPosition;
|
baseParams.StartTimeTicks = startPosition;
|
||||||
}
|
}
|
||||||
@ -541,12 +527,6 @@
|
|||||||
timeStampOffsetMs: 0
|
timeStampOffsetMs: 0
|
||||||
}));
|
}));
|
||||||
|
|
||||||
var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
|
|
||||||
videoCodec: 'theora',
|
|
||||||
audioCodec: 'Vorbis'
|
|
||||||
}));
|
|
||||||
|
|
||||||
|
|
||||||
var html = '';
|
var html = '';
|
||||||
|
|
||||||
var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome);
|
var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome);
|
||||||
@ -570,7 +550,6 @@
|
|||||||
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
|
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
|
||||||
}
|
}
|
||||||
|
|
||||||
html += '<source type="video/ogg" src="' + ogvVideoUrl + '" />';
|
|
||||||
html += '</video';
|
html += '</video';
|
||||||
|
|
||||||
var nowPlayingBar = $('#nowPlayingBar').show();
|
var nowPlayingBar = $('#nowPlayingBar').show();
|
||||||
@ -660,6 +639,12 @@
|
|||||||
setCurrentTime(getCurrentTicks(this), item, true);
|
setCurrentTime(getCurrentTicks(this), item, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}).on("error", function () {
|
||||||
|
|
||||||
|
|
||||||
|
var errorCode = this.error ? this.error.code : '';
|
||||||
|
console.log('Html5 Video error code: ' + errorCode);
|
||||||
|
|
||||||
}).on("ended.playbackstopped", onPlaybackStopped).on('ended.playnext', playNextAfterEnded);
|
}).on("ended.playbackstopped", onPlaybackStopped).on('ended.playnext', playNextAfterEnded);
|
||||||
|
|
||||||
currentItem = item;
|
currentItem = item;
|
||||||
@ -1202,6 +1187,18 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
self.queueItemsNext = function (items) {
|
||||||
|
|
||||||
|
var insertIndex = 1;
|
||||||
|
|
||||||
|
for (var i = 0, length = items.length; i < length; i++) {
|
||||||
|
|
||||||
|
self.playlist.splice(insertIndex, 0, items[i]);
|
||||||
|
|
||||||
|
insertIndex++;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
self.queueItems = function (items) {
|
self.queueItems = function (items) {
|
||||||
|
|
||||||
for (var i = 0, length = items.length; i < length; i++) {
|
for (var i = 0, length = items.length; i < length; i++) {
|
||||||
|
@ -806,7 +806,7 @@ var Dashboard = {
|
|||||||
}).done(function (result) {
|
}).done(function (result) {
|
||||||
|
|
||||||
if (msg.Data.PlayCommand == "PlayNext") {
|
if (msg.Data.PlayCommand == "PlayNext") {
|
||||||
MediaPlayer.queueItems(result.Items);
|
MediaPlayer.queueItemsNext(result.Items);
|
||||||
}
|
}
|
||||||
else if (msg.Data.PlayCommand == "PlayLast") {
|
else if (msg.Data.PlayCommand == "PlayLast") {
|
||||||
MediaPlayer.queueItems(result.Items);
|
MediaPlayer.queueItems(result.Items);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.203" targetFramework="net45" />
|
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.203" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
|
<package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
|
<package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
Loading…
Reference in New Issue
Block a user