mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

switch to new CC url

Browse source
This commit is contained in:
Luke Pulverenti 2014-09-18 00:50:21 -04:00
parent 1f6ce6a409
commit 698fe57e53
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dashboard-ui/channelsettings.html
View file

@ -51,6 +51,7 @@
<label for="txtDownloadSizeLimit">${LabelChannelDownloadSizeLimit}</label> <label for="txtDownloadSizeLimit">${LabelChannelDownloadSizeLimit}</label>
<input type="number" id="txtDownloadSizeLimit" pattern="[0-9]*" min="0.1" step=".1" data-mini="true" /> <input type="number" id="txtDownloadSizeLimit" pattern="[0-9]*" min="0.1" step=".1" data-mini="true" />
<div class="fieldDescription">${LabelChannelDownloadSizeLimitHelp}</div> <div class="fieldDescription">${LabelChannelDownloadSizeLimitHelp}</div>
<div class="fieldDescription" style="margin-top: 5px;"><a href="supporter.html">${ButtonLearnMore}</a></div>
</li> </li>
<li> <li>
<label for="txtDownloadAge">${LabelChannelDownloadAge}</label> <label for="txtDownloadAge">${LabelChannelDownloadAge}</label>

14
dashboard-ui/scripts/channelsettings.js
View file

@ -29,7 +29,13 @@
$('.channelDownloadingList', page).html(html).trigger('create'); $('.channelDownloadingList', page).html(html).trigger('create');
} }
function loadPage(page, config, allChannelFeatures) { function loadPage(page, config, allChannelFeatures, supporterInfo) {
if (supporterInfo.IsMBSupporter) {
$('#txtDownloadSizeLimit', page).attr('max', '100');
} else {
$('#txtDownloadSizeLimit', page).attr('max', '.5');
}
if (allChannelFeatures.length) { if (allChannelFeatures.length) {
$('.noChannelsHeader', page).hide(); $('.noChannelsHeader', page).hide();
@ -86,13 +92,15 @@
var promise1 = ApiClient.getNamedConfiguration("channels"); var promise1 = ApiClient.getNamedConfiguration("channels");
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels/Features")); var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels/Features"));
var promise3 = Dashboard.getPluginSecurityInfo();
$.when(promise1, promise2).done(function (response1, response2) { $.when(promise1, promise2, promise3).done(function (response1, response2, response3) {
var config = response1[0]; var config = response1[0];
var allFeatures = response2[0]; var allFeatures = response2[0];
var supporterInfo = response3;
loadPage(page, config, allFeatures); loadPage(page, config, allFeatures, supporterInfo);
}); });

3
dashboard-ui/scripts/chromecast.js
View file

@ -79,9 +79,10 @@
// v1 Id AE4DA10A // v1 Id AE4DA10A
// v2 Id 472F0435 // v2 Id 472F0435
// v3 Id 69C59853 // v3 Id 69C59853
// v4 Id F4EB2E8E
// default receiver chrome.cast.media.DEFAULT_MEDIA_RECEIVER_APP_ID // default receiver chrome.cast.media.DEFAULT_MEDIA_RECEIVER_APP_ID
var applicationID = "69C59853"; var applicationID = "F4EB2E8E";
// request session // request session
var sessionRequest = new chrome.cast.SessionRequest(applicationID); var sessionRequest = new chrome.cast.SessionRequest(applicationID);

6
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1076,7 +1076,8 @@
maxWidth: webmQuality.maxWidth, maxWidth: webmQuality.maxWidth,
videoBitrate: webmQuality.videoBitrate, videoBitrate: webmQuality.videoBitrate,
audioBitrate: webmQuality.audioBitrate, audioBitrate: webmQuality.audioBitrate,
EnableAutoStreamCopy: false EnableAutoStreamCopy: false,
ClientTime: new Date().getTime()
})); }));
var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, { var hlsVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/master.m3u8', $.extend({}, baseParams, {
@ -1087,7 +1088,8 @@
AudioCodec: m3U8Quality.audioCodec, AudioCodec: m3U8Quality.audioCodec,
profile: 'baseline', profile: 'baseline',
level: '3', level: '3',
StartTimeTicks: 0 StartTimeTicks: 0,
ClientTime: new Date().getTime()
})) + seekParam; })) + seekParam;

3
dashboard-ui/scripts/mediaplayer.js
View file

@ -141,6 +141,7 @@
currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4'); currentSrc = currentSrc.replace('.webm', '.mp4').replace('.m3u8', '.mp4');
} else { } else {
currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension); currentSrc = currentSrc.replace('.mp4', transcodingExtension).replace('.m4v', transcodingExtension).replace('.mkv', transcodingExtension);
currentSrc = replaceQueryString(currentSrc, 'ClientTime', new Date().getTime());
} }
currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate); currentSrc = replaceQueryString(currentSrc, 'AudioBitrate', finalParams.audioBitrate);
@ -1247,6 +1248,8 @@
if (isStatic) { if (isStatic) {
var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : ''; var seekParam = startPositionTicks ? '#t=' + (startPositionTicks / 10000000) : '';
audioUrl += "&static=true" + seekParam; audioUrl += "&static=true" + seekParam;
} else {
audioUrl += "&ClientTime=" + new Date().getTime();
} }
self.startTimeTicksOffset = isStatic ? 0 : startPositionTicks; self.startTimeTicksOffset = isStatic ? 0 : startPositionTicks;