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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tim Hobbs 2014-03-24 09:37:44 -07:00
commit d843edfa31
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApiClient.js
View File

@ -3809,7 +3809,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
var deferred = $.Deferred();
var msg = [itemId, canSeek, queueableMediaTypes];
if (mediaSourceId) {
msg.push(mediaSourceId);
}
@ -4029,7 +4029,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
self.createPackageReview = function (review) {
var url = self.getUrl("PackageReviews/" + review.id, review);
var url = self.getUrl("Packages/Reviews/" + review.id, review);
return self.ajax({
type: "POST",
@ -4058,7 +4058,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
options.ForceTitle = true;
}
var url = self.getUrl("PackageReviews/" + packageId, options);
var url = self.getUrl("Packages/" + packageId + "Reviews", options);
return self.ajax({
type: "GET",

10
dashboard-ui/dlnasettings.html
View File

@ -21,6 +21,16 @@
<input type="checkbox" id="chkEnablePlayTo" data-mini="true" />
<div class="fieldDescription">Media Browser can detect devices within your network and offer the ability to remote control them.</div>
</li>
<li>
<label for="chkEnableDlnaDebugLogging">Enable DLNA debug logging</label>
<input type="checkbox" id="chkEnableDlnaDebugLogging" data-mini="true" />
<div class="fieldDescription">This will create large log files and should only be used as needed for troubleshooting purposes.</div>
</li>
<li>
<label for="txtClientDiscoveryInterval">Client discovery interval (seconds)</label>
<input type="number" id="txtClientDiscoveryInterval" data-mini="true" min="1" max="300" />
<div class="fieldDescription">Determines the duration in seconds of the interval between SSDP searches performed by Media Browser.</div>
</li>
<li>
<button type="submit" data-theme="b" data-icon="check">
Save

6
dashboard-ui/scripts/dlnasettings.js
View File

@ -3,7 +3,9 @@
function loadPage(page, config) {
$('#chkEnablePlayTo', page).checked(config.DlnaOptions.EnablePlayTo).checkboxradio("refresh");
$('#chkEnableDlnaDebugLogging', page).checked(config.DlnaOptions.EnableDebugLogging).checkboxradio("refresh");
$('#txtClientDiscoveryInterval', page).val(config.DlnaOptions.ClientDiscoveryIntervalSeconds);
Dashboard.hideLoadingMsg();
}
@ -30,6 +32,8 @@
ApiClient.getServerConfiguration().done(function (config) {
config.DlnaOptions.EnablePlayTo = $('#chkEnablePlayTo', form).checked();
config.DlnaOptions.EnableDebugLogging = $('#chkEnableDlnaDebugLogging', form).checked();
config.DlnaOptions.ClientDiscoveryIntervalSeconds = $('#txtClientDiscoveryInterval', form).val();
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
});

2
packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.247" targetFramework="net45" />
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.248" targetFramework="net45" />
</packages>