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

update keyframe setting

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-12 01:49:03 -05:00
parent 79fa61fa33
commit a75e37be73
18 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -811,13 +811,11 @@
self.getPlayerState = function () {
var deferred = $.Deferred();
return new Promise(function (resolve, reject) {
var result = self.getPlayerStateInternal();
deferred.resolveWith(null, [result]);
return deferred.promise();
var result = self.getPlayerStateInternal();
resolve(result);
});
};
self.lastPlayerData = {};
@ -833,9 +831,9 @@
self.tryPair = function (target) {
var deferred = $.Deferred();
deferred.resolve();
return deferred.promise();
return new Promise(function (resolve, reject) {
resolve();
});
};
}

4
dashboard-ui/scripts/globalize.js
View file

@ -30,11 +30,15 @@
var requestUrl = url + "?v=" + AppInfo.appVersion;
Logger.log('Requesting ' + requestUrl);
var xhr = new XMLHttpRequest();
xhr.open('GET', requestUrl, true);
xhr.onload = function (e) {
Logger.log('Globalize response status: ' + this.status);
if (this.status < 400) {
dictionaries[url] = JSON.parse(this.response);

2
dashboard-ui/scripts/livetvsuggested.js
View file

@ -152,7 +152,7 @@
initMethod = 'initSuggestedTab';
break;
case 1:
depends.push('scripts/registrationservices');
depends.push('registrationservices');
depends.push('scripts/livetvguide');
renderMethod = 'renderGuideTab';
initMethod = 'initGuideTab';

2
dashboard-ui/scripts/mediacontroller.js
View file

@ -469,7 +469,7 @@
return;
}
requirejs(["scripts/registrationservices"], function () {
requirejs(["registrationservices"], function () {
self.playbackTimeLimitMs = null;

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

@ -201,6 +201,14 @@
profile.TranscodingProfiles = [];
//profile.TranscodingProfiles.push({
// Container: 'mkv',
// Type: 'Video',
// AudioCodec: 'aac' + (canPlayAc3 ? ',ac3' : ''),
// VideoCodec: 'h264',
// Context: 'Streaming'
//});
if (self.canPlayHls()) {
profile.TranscodingProfiles.push({
Container: 'ts',

4
dashboard-ui/scripts/metadataadvanced.js
View file

@ -14,8 +14,6 @@
$('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh");
$('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh");
$('.chkEnableVideoFrameAnalysis', page).checked(config.EnableVideoFrameByFrameAnalysis);
Dashboard.hideLoadingMsg();
}
@ -174,8 +172,6 @@
config.SaveMetadataHidden = $('#chkSaveMetadataHidden', form).checked();
config.EnableVideoFrameByFrameAnalysis = $('.chkEnableVideoFrameAnalysis', form).checked();
config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked();
config.EnableTmdbUpdates = $('#chkEnableTmdbUpdates', form).checked();
config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked();

22
dashboard-ui/scripts/site.js
View file

@ -1867,6 +1867,13 @@ var AppInfo = {};
define('fetch', [bowerPath + '/fetch/fetch']);
define('webcomponentsjs', [bowerPath + '/webcomponentsjs/webcomponents-lite.min.js']);
define('native-promise-only', [bowerPath + '/native-promise-only/lib/npo.src']);
if (Dashboard.isRunningInCordova()) {
define('registrationservices', ['cordova/registrationservices']);
} else {
define('registrationservices', ['scripts/registrationservices']);
}
}
function init(hostingAppInfo) {
@ -2145,25 +2152,19 @@ var AppInfo = {};
}
if (Dashboard.isRunningInCordova()) {
deps.push('cordova/registrationservices');
deps.push('registrationservices');
deps.push('cordova/back');
if (browserInfo.android) {
deps.push('cordova/android/androidcredentials');
}
} else {
deps.push('scripts/registrationservices');
}
if (browserInfo.msie) {
deps.push('devices/ie/ie');
}
if (AppInfo.isNativeApp && browserInfo.safari) {
deps.push('cordova/ios/tabbar');
}
deps.push('scripts/search');
deps.push('scripts/librarylist');
deps.push('scripts/alphapicker');
@ -2223,6 +2224,11 @@ var AppInfo = {};
postInitDependencies.push('scripts/nowplayingbar');
}
if (AppInfo.isNativeApp && browserInfo.safari) {
postInitDependencies.push('cordova/ios/tabbar');
}
require(postInitDependencies);
});
}

2
dashboard-ui/scripts/sync.js
View file

@ -203,7 +203,7 @@
function showSyncMenu(options) {
requirejs(["scripts/registrationservices"], function () {
requirejs(["registrationservices"], function () {
RegistrationServices.validateFeature('sync').then(function () {
showSyncMenuInternal(options);
});

2
dashboard-ui/scripts/syncactivity.js
View file

@ -388,7 +388,7 @@
$('.btnSyncSupporter', page).on('click', function () {
requirejs(["scripts/registrationservices"], function () {
requirejs(["registrationservices"], function () {
RegistrationServices.validateFeature('sync').then(function () {
});
});