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 recording screens

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-21 13:07:18 -04:00
parent cb199a5152
commit e55726cccf
6 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.js vendored
View file

@ -1,4 +1,4 @@
define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'recordingHelper', 'paper-icon-button-light', 'emby-button'], function (globalize, connectionManager, require, loading, appHost, recordingHelper) { define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom', 'recordingHelper', 'paper-icon-button-light', 'emby-button'], function (globalize, connectionManager, require, loading, appHost, dom, recordingHelper) {
function getRegistration(apiClient, programId, feature) { function getRegistration(apiClient, programId, feature) {
@ -204,7 +204,8 @@
var options = this.options; var options = this.options;
var apiClient = connectionManager.getApiClient(options.serverId); var apiClient = connectionManager.getApiClient(options.serverId);
var isChecked = !e.target.querySelector('i').classList.contains('recordingIcon-active'); var button = dom.parentWithTag(e.target, 'BUTTON');
var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active');
if (isChecked) { if (isChecked) {
if (!this.TimerId && !this.SeriesTimerId) { if (!this.TimerId && !this.SeriesTimerId) {
@ -229,7 +230,8 @@
var options = this.options; var options = this.options;
var apiClient = connectionManager.getApiClient(options.serverId); var apiClient = connectionManager.getApiClient(options.serverId);
var isChecked = !e.target.querySelector('i').classList.contains('recordingIcon-active'); var button = dom.parentWithTag(e.target, 'BUTTON');
var isChecked = !button.querySelector('i').classList.contains('recordingIcon-active');
if (isChecked) { if (isChecked) {
showSeriesRecordingFields(options.parent, options.programId, apiClient); showSeriesRecordingFields(options.parent, options.programId, apiClient);

2
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingfields.template.html vendored
View file

@ -5,7 +5,7 @@
.recordingButton { .recordingButton {
margin-left: 0; margin-left: 0;
padding: .6em 1.05em .55em .8em; padding: .65em 1.05em .6em .8em;
min-width: 10em; min-width: 10em;
} }

4
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/seriesrecordingeditor.template.html vendored
View file

@ -23,10 +23,6 @@
</select> </select>
</div> </div>
<h1>
${Advanced}
</h1>
<div class="inputContainer"> <div class="inputContainer">
<input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}" /> <input is="emby-input" type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}" />
</div> </div>

10
dashboard-ui/scripts/encodingsettings.js
View file

@ -44,10 +44,6 @@
return ApiClient.getSystemInfo().then(function (systemInfo) { return ApiClient.getSystemInfo().then(function (systemInfo) {
if (systemInfo.EncoderLocationType == "External") {
return;
}
return ApiClient.ajax({ return ApiClient.ajax({
url: ApiClient.getUrl('System/MediaEncoder/Path'), url: ApiClient.getUrl('System/MediaEncoder/Path'),
type: 'POST', type: 'POST',
@ -212,11 +208,7 @@
ApiClient.getSystemInfo().then(function (systemInfo) { ApiClient.getSystemInfo().then(function (systemInfo) {
if (systemInfo.EncoderLocationType == "External") { page.querySelector('.fldSelectEncoderPathType').classList.remove('hide');
page.querySelector('.fldSelectEncoderPathType').classList.add('hide');
} else {
page.querySelector('.fldSelectEncoderPathType').classList.remove('hide');
}
loadPage(page, config, systemInfo); loadPage(page, config, systemInfo);
}); });
}); });

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

@ -676,11 +676,11 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
} }
var onBitrateDetected = function () { var onBitrateDetected = function () {
Dashboard.getDeviceProfile(null, { Dashboard.getDeviceProfile(null, {
enableMkvProgressive: item.RunTimeTicks != null, enableMkvProgressive: item.RunTimeTicks != null,
enableTsProgressive: item.RunTimeTicks != null, enableTsProgressive: item.RunTimeTicks != null
enableHls: !browserInfo.firefox || item.RunTimeTicks == null
}).then(function (deviceProfile) { }).then(function (deviceProfile) {
playOnDeviceProfileCreated(deviceProfile, item, startPosition, callback); playOnDeviceProfileCreated(deviceProfile, item, startPosition, callback);

9
dashboard-ui/scripts/userprofilespage.js
View file

@ -6,7 +6,14 @@
require(['confirm'], function (confirm) { require(['confirm'], function (confirm) {
confirm(msg, Globalize.translate('DeleteUser')).then(function () { confirm({
title: Globalize.translate('DeleteUser'),
text: msg,
confirmText: Globalize.translate('ButtonDelete'),
primary: 'cancel'
}).then(function () {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();