cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

update to service stack 3.0.70.0

Browse Source
This commit is contained in:
Luke Pulverenti 2013-11-30 13:32:39 -05:00
parent dbf7337f7c
commit 7e5011f03d
7 changed files with 45 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dashboard-ui/dashboard.html
View File

@ -32,7 +32,6 @@
</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>Program data path: <span id="programDataPath"></span></p>
<div id="pPluginUpdates"></div>
</div>
</div>
@ -74,7 +73,7 @@
</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>
<div>
<p><a href="http://mediabrowser3.com/community" target="_blank">Community</a></p>
@ -84,6 +83,14 @@
</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">
<h3 style="padding-left: 1em;">Help improve Media Browser</h3>
<form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr"

5
dashboard-ui/log.html
View File

@ -15,11 +15,14 @@
<a href="supporterkey.html" data-role="button">Supporter Key</a>
<a href="about.html" data-role="button">About</a>
</div>
<p>
Log path: <span id="logPath"></span>
</p>
<p>
<label for="chkAutoScroll">Auto-scroll</label>
<input type="checkbox" id="chkAutoScroll" onchange="LogPage.updateAutoScroll(this.checked);" name="chkAutoScroll" data-inline="true" />
</p>
<textarea id="logContents" class="pre" style="overflow-y:hidden;"></textarea>
<textarea id="logContents" class="pre" style="overflow-y: hidden;"></textarea>
<p>
<label for="chkAutoScrollBottom">Auto-scroll</label>
<input type="checkbox" id="chkAutoScrollBottom" name="chkAutoScrollBottom" onchange="LogPage.updateAutoScroll(this.checked);" data-inline="true" />

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

@ -326,7 +326,8 @@
$('#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();

10
dashboard-ui/scripts/logpage.js
View File

@ -2,9 +2,11 @@
onPageShow: function () {
var page = this;
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);
@ -18,6 +20,12 @@
else if (autoScroll == "false") {
LogPage.updateAutoScroll(false);
}
ApiClient.getSystemInfo().done(function(systemInfo) {
$('#logPath', page).html(systemInfo.LogPath);
});
},
onPageHide: function () {

39
dashboard-ui/scripts/mediaplayer.js
View File

@ -503,20 +503,6 @@
var h264Codec = 'h264';
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) {
baseParams.StartTimeTicks = startPosition;
}
@ -541,12 +527,6 @@
timeStampOffsetMs: 0
}));
var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
videoCodec: 'theora',
audioCodec: 'Vorbis'
}));
var html = '';
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/ogg" src="' + ogvVideoUrl + '" />';
html += '</video';
var nowPlayingBar = $('#nowPlayingBar').show();
@ -660,6 +639,12 @@
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);
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) {
for (var i = 0, length = items.length; i < length; i++) {

2
dashboard-ui/scripts/site.js
View File

@ -806,7 +806,7 @@ var Dashboard = {
}).done(function (result) {
if (msg.Data.PlayCommand == "PlayNext") {
MediaPlayer.queueItems(result.Items);
MediaPlayer.queueItemsNext(result.Items);
}
else if (msg.Data.PlayCommand == "PlayLast") {
MediaPlayer.queueItems(result.Items);

4
packages.config
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.203" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.70" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.70" targetFramework="net45" />
</packages>