mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update startup wizard
This commit is contained in:
parent
9074b4bea3
commit
20b01a80b3
28 changed files with 447 additions and 121 deletions
|
@ -62,7 +62,7 @@
|
|||
update('enableSyncToExternalStorage', val.toString());
|
||||
}
|
||||
|
||||
return appStorage.getItem('enableSyncToExternalStorage') == 'true';
|
||||
return appStorage.getItem('enableSyncToExternalStorage') != 'false';
|
||||
},
|
||||
|
||||
displayPreferencesKey: function() {
|
||||
|
|
|
@ -382,7 +382,7 @@
|
|||
|
||||
var apiClient = window.ApiClient;
|
||||
|
||||
apiClient.getUserViews(userId).done(function (result) {
|
||||
apiClient.getUserViews({}, userId).done(function (result) {
|
||||
|
||||
var items = result.Items;
|
||||
|
||||
|
|
|
@ -1726,7 +1726,7 @@
|
|||
};
|
||||
|
||||
info = $.extend(info, state.PlayState);
|
||||
|
||||
console.log('repeat mode ' + info.RepeatMode);
|
||||
ApiClient.reportPlaybackProgress(info);
|
||||
}
|
||||
|
||||
|
|
|
@ -173,7 +173,7 @@
|
|||
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels", {
|
||||
UserId: user.Id
|
||||
}));
|
||||
var promise3 = ApiClient.getUserViews(user.Id);
|
||||
var promise3 = ApiClient.getUserViews({}, user.Id);
|
||||
var promise4 = ApiClient.getJSON(ApiClient.getUrl("Users/" + user.Id + "/SpecialViewOptions"));
|
||||
|
||||
$.when(promise1, promise2, promise3, promise4).done(function (r1, r2, r3, r4) {
|
||||
|
@ -225,8 +225,8 @@
|
|||
displayPreferences.CustomPrefs.home2 = $('#selectHomeSection3', page).val();
|
||||
displayPreferences.CustomPrefs.home3 = $('#selectHomeSection4', page).val();
|
||||
|
||||
ApiClient.updateDisplayPreferences('home', displayPreferences, user.Id, AppSettings.displayPreferencesKey()).done(function() {
|
||||
|
||||
ApiClient.updateDisplayPreferences('home', displayPreferences, user.Id, AppSettings.displayPreferencesKey()).done(function () {
|
||||
|
||||
ApiClient.updateUserConfiguration(user.Id, user.Configuration).done(function () {
|
||||
Dashboard.alert(Globalize.translate('SettingsSaved'));
|
||||
|
||||
|
|
|
@ -140,18 +140,19 @@
|
|||
|
||||
toggleRepeatButton = $('.toggleRepeatButton', elem).on('click', function () {
|
||||
|
||||
if (currentPlayer && lastPlayerState) {
|
||||
var state = lastPlayerState;
|
||||
if (currentPlayer) {
|
||||
var state = lastPlayerState || {};
|
||||
|
||||
switch ((state.PlayState || {}).RepeatMode) {
|
||||
case 'RepeatNone':
|
||||
currentPlayer.setRepeatMode('RepeatAll');
|
||||
break;
|
||||
case 'RepeatAll':
|
||||
currentPlayer.setRepeatMode('RepeatOne');
|
||||
break;
|
||||
case 'RepeatOne':
|
||||
currentPlayer.setRepeatMode('RepeatNone');
|
||||
break;
|
||||
default:
|
||||
currentPlayer.setRepeatMode('RepeatAll');
|
||||
break;
|
||||
}
|
||||
}
|
||||
})[0];
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
var deferred = $.Deferred();
|
||||
|
||||
ApiClient.getUserViews(userId).done(function (result) {
|
||||
ApiClient.getUserViews({}, userId).done(function (result) {
|
||||
|
||||
var items = result.Items;
|
||||
|
||||
|
|
|
@ -1731,7 +1731,7 @@ var AppInfo = {};
|
|||
AppInfo.supportsSyncPathSetting = isCordova && isAndroid;
|
||||
|
||||
if (isCordova && isAndroid) {
|
||||
AppInfo.directPlayAudioContainers = "flac,aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape".split(',');
|
||||
AppInfo.directPlayAudioContainers = "flac,aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
|
||||
AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(',');
|
||||
} else {
|
||||
AppInfo.directPlayAudioContainers = [];
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
function onSubmit() {
|
||||
|
||||
var page = $(this).parents('.page');
|
||||
var page = $(this).parents('.page')[0];
|
||||
|
||||
if ($('#chkAccept', page).checked()) {
|
||||
if (page.querySelector('.chkAccept').checked) {
|
||||
Dashboard.navigate('wizardfinish.html');
|
||||
} else {
|
||||
|
||||
|
@ -17,9 +17,9 @@
|
|||
return false;
|
||||
}
|
||||
|
||||
$(document).on('pageinitdepends', '#wizardAgreementPage', function(){
|
||||
$(document).on('pageinitdepends', '#wizardAgreementPage', function () {
|
||||
|
||||
$('.wizardAgreementForm').off('submit', onSubmit).on('submit', onSubmit);
|
||||
$('.wizardAgreementForm').off('submit', onSubmit).on('submit', onSubmit);
|
||||
});
|
||||
|
||||
})(window, jQuery);
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
config.PreferredMetadataLanguage = $('#selectLanguage', page).val();
|
||||
config.MetadataCountryCode = $('#selectCountry', page).val();
|
||||
config.SaveLocalMeta = $('#chkSaveLocalMetadata', page).checked();
|
||||
config.EnableInternetProviders = $('#chkEnableInternetProviders', page).checked();
|
||||
config.SaveLocalMeta = page.querySelector('.chkSaveLocalMetadata').checked;
|
||||
config.EnableInternetProviders = page.querySelector('.chkEnableInternetProviders').checked;
|
||||
|
||||
apiClient.ajax({
|
||||
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
type: 'POST',
|
||||
data: {
|
||||
|
||||
Name: $('#txtUsername', form).val(),
|
||||
ConnectUserName: $('#txtConnectUserName', form).val()
|
||||
Name: form.querySelector('#txtUsername').value,
|
||||
ConnectUserName: page.querySelector('#txtConnectUserName').value
|
||||
|
||||
},
|
||||
url: apiClient.getUrl('Startup/User'),
|
||||
|
@ -70,8 +70,8 @@
|
|||
|
||||
apiClient.getJSON(apiClient.getUrl('Startup/User')).done(function (user) {
|
||||
|
||||
$('#txtUsername', page).val(user.Name);
|
||||
$('#txtConnectUserName', page).val(user.ConnectUserName);
|
||||
page.querySelector('#txtUsername').value = user.Name;
|
||||
page.querySelector('#txtConnectUserName').value = user.ConnectUserName;
|
||||
|
||||
Dashboard.hideLoadingMsg();
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue