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

merge branch master into strings

Browse source
This commit is contained in:
dkanada 2020-08-31 23:47:11 +09:00
commit 99e0785639
51 changed files with 2423 additions and 2012 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/dashboard/encodingsettings.js
View file

@ -48,7 +48,8 @@ import libraryMenu from 'libraryMenu';
data: JSON.stringify({
Path: form.querySelector('.txtEncoderPath').value,
PathType: 'Custom'
})
}),
contentType: 'application/json'
}).then(Dashboard.processServerConfigurationUpdateResult, onSaveEncodingPathFailure);
});
}

20
src/controllers/itemDetails/index.html
View file

@ -7,11 +7,11 @@
<div class="detailPagePrimaryContainer padded-left padded-right">
<div class="infoWrapper infoText">
<div class="nameContainer"></div>
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em"></div>
<div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em"></div>
<div class="itemMiscInfo itemMiscInfo-primary" style="margin-bottom: 0.6em;"></div>
<div class="itemMiscInfo itemMiscInfo-secondary" style="margin-bottom: 0.6em;"></div>
</div>
<div class="mainDetailButtons">
<div class="mainDetailButtons focuscontainer-x">
<button is="emby-button" type="button" class="button-flat btnResume hide detailButton" title="${ButtonResume}" data-mode="resume">
<div class="detailButton-content">
<span class="material-icons detailButton-icon play_arrow"></span>
@ -95,17 +95,17 @@
<div class="itemDetailsGroup">
<div class="detailsGroupItem genresGroup hide">
<div class="genresLabel label"></div>
<div class="genres content"></div>
<div class="genres content focuscontainer-x"></div>
</div>
<div class="detailsGroupItem directorsGroup hide">
<div class="directorsLabel label"></div>
<div class="directors content"></div>
<div class="directors content focuscontainer-x"></div>
</div>
<div class="detailsGroupItem writersGroup hide">
<div class="writersLabel label"></div>
<div class="writers content"></div>
<div class="writers content focuscontainer-x"></div>
</div>
</div>
@ -124,7 +124,7 @@
</div>
</form>
<div class="recordingFields hide" style="margin: .5em 0 1.5em;"></div>
<div class="recordingFields hide" style="margin: 0.5em 0 1.5em;"></div>
<div class="detailSectionContent">
<div class="itemLastPlayed hide"></div>
@ -139,14 +139,14 @@
<p id="itemDeathDate"></p>
<p id="seriesAirTime"></p>
<div class="itemTags hide" style="margin: .7em 0;font-size:92%;"></div>
<div class="itemExternalLinks hide" style="margin: .7em 0;font-size:92%;"></div>
<div class="itemTags focuscontainer-x hide" style="margin: 0.7em 0; font-size: 92%;"></div>
<div class="itemExternalLinks focuscontainer-x hide" style="margin: 0.7em 0; font-size: 92%;"></div>
<div class="seriesRecordingEditor"></div>
</div>
</div>
</div>
<div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top:-3em;">
<div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top: -3em;">
<h2 class="sectionTitle">${Schedule}</h2>
<div class="seriesTimerSchedule padded-right"></div>
</div>

3534
src/controllers/itemDetails/index.js
View file

File diff suppressed because it is too large Load diff

2
src/controllers/playback/video/index.js
View file

@ -693,7 +693,7 @@ import 'css!assets/css/videoosd';
lastUpdateTime = now;
const player = this;
currentRuntimeTicks = playbackManager.duration(player);
const currentTime = playbackManager.currentTime(player);
const currentTime = playbackManager.currentTime(player) * 10000;
updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player));
const item = currentItem;
refreshProgramInfoIfNeeded(player, item);

3
src/controllers/session/resetPassword/index.js
View file

@ -31,7 +31,8 @@ import globalize from 'globalize';
dataType: 'json',
data: JSON.stringify({
Pin: view.querySelector('#txtPin').value
})
}),
contentType: 'application/json'
}).then(processForgotPasswordResult);
e.preventDefault();
return false;

2
src/controllers/user/menu/index.html
View file

@ -57,7 +57,7 @@
</div>
</a>
</div>
<div class="adminSection verticalSection verticalSection-extrabottompadding">
<div class="adminSection verticalSection verticalSection-extrabottompadding hide">
<h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
<a is="emby-linkbutton" href="dashboard.html" style="display:block;padding:0;margin:0;" class="listItem-border">
<div class="listItem">

17
src/controllers/user/menu/index.js
View file

@ -1,4 +1,5 @@
import appHost from 'apphost';
import layoutManager from 'layoutManager';
import 'listViewStyle';
import 'emby-button';
@ -38,19 +39,19 @@ export default function (view, params) {
page.querySelector('.selectServer').classList.add('hide');
}
// hide the actions if user preferences are being edited for a different user
ApiClient.getUser(userId).then(function (user) {
page.querySelector('.headerUsername').innerHTML = user.Name;
if (user.Policy.IsAdministrator && !layoutManager.tv) {
page.querySelector('.adminSection').classList.remove('hide');
}
});
// Hide the actions if user preferences are being edited for a different user
if (params.userId && params.userId !== Dashboard.getCurrentUserId) {
page.querySelector('.userSection').classList.add('hide');
page.querySelector('.adminSection').classList.add('hide');
}
ApiClient.getUser(userId).then(function (user) {
page.querySelector('.headerUsername').innerHTML = user.Name;
if (!user.Policy.IsAdministrator) {
page.querySelector('.adminSection').classList.add('hide');
}
});
import('autoFocuser').then(({default: autoFocuser}) => {
autoFocuser.autoFocus(view);
});

3
src/controllers/wizard/remote/index.js
View file

@ -12,7 +12,8 @@ function save(page) {
apiClient.ajax({
type: 'POST',
data: JSON.stringify(config),
url: apiClient.getUrl('Startup/RemoteAccess')
url: apiClient.getUrl('Startup/RemoteAccess'),
contentType: 'application/json'
}).then(function () {
loading.hide();
navigateToNextPage();

3
src/controllers/wizard/settings/index.js
View file

@ -12,7 +12,8 @@ function save(page) {
apiClient.ajax({
type: 'POST',
data: JSON.stringify(config),
url: apiClient.getUrl('Startup/Configuration')
url: apiClient.getUrl('Startup/Configuration'),
contentType: 'application/json'
}).then(function () {
loading.hide();
navigateToNextPage();

3
src/controllers/wizard/start/index.js
View file

@ -18,7 +18,8 @@ function save(page) {
apiClient.ajax({
type: 'POST',
data: JSON.stringify(config),
url: apiClient.getUrl('Startup/Configuration')
url: apiClient.getUrl('Startup/Configuration'),
contentType: 'application/json'
}).then(function () {
Dashboard.navigate('wizarduser.html');
});

3
src/controllers/wizard/user/index.js
View file

@ -27,7 +27,8 @@ function submit(form) {
Name: form.querySelector('#txtUsername').value,
Password: form.querySelector('#txtManualPassword').value
}),
url: apiClient.getUrl('Startup/User')
url: apiClient.getUrl('Startup/User'),
contentType: 'application/json'
}).then(onUpdateUserComplete);
}