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 remote-tracking branch 'upstream/master' into more-es6

Browse source
This commit is contained in:
MrTimscampi 2020-08-06 22:39:11 +02:00
commit 936ff4186d
310 changed files with 9162 additions and 13374 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/components/subtitleeditor/subtitleeditor.js
View file

@ -1,48 +1,13 @@
define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings', 'connectionManager', 'loading', 'focusManager', 'dom', 'apphost', 'emby-select', 'listViewStyle', 'paper-icon-button-light', 'css!./../formdialog', 'material-icons', 'css!./subtitleeditor', 'emby-button', 'flexStyles'], function (dialogHelper, require, layoutManager, globalize, userSettings, connectionManager, loading, focusManager, dom, appHost) {
'use strict';
loading = loading.default || loading;
focusManager = focusManager.default || focusManager;
var currentItem;
var hasChanges;
function showLocalSubtitles(context, index) {
loading.show();
var subtitleContent = context.querySelector('.subtitleContent');
subtitleContent.innerHTML = '';
var apiClient = connectionManager.getApiClient(currentItem.ServerId);
var url = 'Videos/' + currentItem.Id + '/Subtitles/' + index;
apiClient.ajax({
type: 'GET',
url: url
}).then(function (result) {
subtitleContent.innerHTML = result;
loading.hide();
});
}
function showRemoteSubtitles(context, id) {
loading.show();
var url = 'Providers/Subtitles/Subtitles/' + id;
ApiClient.get(ApiClient.getUrl(url)).then(function (result) {
// show result
loading.hide();
});
}
function downloadRemoteSubtitles(context, id) {
var url = 'Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + id;
var apiClient = connectionManager.getApiClient(currentItem.ServerId);
@ -52,7 +17,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
url: apiClient.getUrl(url)
}).then(function () {
hasChanges = true;
require(['toast'], function (toast) {
@ -64,11 +28,9 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function deleteLocalSubtitle(context, index) {
var msg = globalize.translate('MessageAreYouSureDeleteSubtitles');
require(['confirm'], function (confirm) {
confirm.default({
title: globalize.translate('ConfirmDeletion'),
@ -77,7 +39,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
primary: 'delete'
}).then(function () {
loading.show();
var itemId = currentItem.Id;
@ -91,34 +52,28 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
url: apiClient.getUrl(url)
}).then(function () {
hasChanges = true;
reload(context, apiClient, itemId);
});
});
});
}
function fillSubtitleList(context, item) {
var streams = item.MediaStreams || [];
var subs = streams.filter(function (s) {
return s.Type === 'Subtitle';
});
var html = '';
if (subs.length) {
html += '<h2>' + globalize.translate('MySubtitles') + '</h2>';
html += '<div>';
html += subs.map(function (s) {
var itemHtml = '';
var tagName = layoutManager.tv ? 'button' : 'div';
@ -156,7 +111,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
itemHtml += '</' + tagName + '>';
return itemHtml;
}).join('');
html += '</div>';
@ -170,22 +124,12 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
elem.classList.add('hide');
}
elem.innerHTML = html;
//('.btnViewSubtitles', elem).on('click', function () {
// var index = this.getAttribute('data-index');
// showLocalSubtitles(context, index);
//});
}
function fillLanguages(context, apiClient, languages) {
var selectLanguage = context.querySelector('#selectLanguage');
selectLanguage.innerHTML = languages.map(function (l) {
return '<option value="' + l.ThreeLetterISOLanguageName + '">' + l.DisplayName + '</option>';
});
@ -193,9 +137,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
if (lastLanguage) {
selectLanguage.value = lastLanguage;
} else {
apiClient.getCurrentUser().then(function (user) {
var lang = user.Configuration.SubtitleLanguagePreference;
if (lang) {
@ -206,12 +148,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function renderSearchResults(context, results) {
var lastProvider = '';
var html = '';
if (!results.length) {
context.querySelector('.noSearchResults').classList.remove('hide');
context.querySelector('.subtitleResults').innerHTML = '';
loading.hide();
@ -221,13 +161,11 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
context.querySelector('.noSearchResults').classList.add('hide');
for (var i = 0, length = results.length; i < length; i++) {
var result = results[i];
var provider = result.ProviderName;
if (provider !== lastProvider) {
if (i > 0) {
html += '</div>';
}
@ -250,8 +188,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
html += '<div class="listItemBody ' + bodyClass + '">';
//html += '<a class="btnViewSubtitle" href="#" data-subid="' + result.Id + '">';
html += '<div>' + (result.Name) + '</div>';
html += '<div class="secondary listItemBodyText">';
@ -272,8 +208,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
html += '<div class="secondary listItemBodyText"><div class="inline-flex align-items-center justify-content-center" style="background:#3388cc;color:#fff;padding: .3em 1em;border-radius:1000em;">' + globalize.translate('PerfectMatch') + '</div></div>';
}
//html += '</a>';
html += '</div>';
if (!layoutManager.tv) {
@ -290,17 +224,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
var elem = context.querySelector('.subtitleResults');
elem.innerHTML = html;
//('.btnViewSubtitle', elem).on('click', function () {
// var id = this.getAttribute('data-subid');
// showRemoteSubtitles(context, id);
//});
loading.hide();
}
function searchForSubtitles(context, language) {
userSettings.set('subtitleeditor-language', language);
loading.show();
@ -309,17 +236,14 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
var url = apiClient.getUrl('Items/' + currentItem.Id + '/RemoteSearch/Subtitles/' + language);
apiClient.getJSON(url).then(function (results) {
renderSearchResults(context, results);
});
}
function reload(context, apiClient, itemId) {
context.querySelector('.noSearchResults').classList.add('hide');
function onGetItem(item) {
currentItem = item;
fillSubtitleList(context, item);
@ -359,7 +283,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function onSubtitleListClick(e) {
var btnDelete = dom.parentWithClass(e.target, 'btnDelete');
if (btnDelete) {
var index = btnDelete.getAttribute('data-index');
@ -369,11 +292,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function onSubtitleResultsClick(e) {
var btnOptions = dom.parentWithClass(e.target, 'btnOptions');
var subtitleId;
var context;
var btnOptions = dom.parentWithClass(e.target, 'btnOptions');
if (btnOptions) {
subtitleId = btnOptions.getAttribute('data-subid');
context = dom.parentWithClass(btnOptions, 'subtitleEditorDialog');
@ -389,7 +311,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function showDownloadOptions(button, context, subtitleId) {
var items = [];
items.push({
@ -398,15 +319,12 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
});
require(['actionsheet'], function (actionsheet) {
actionsheet.show({
items: items,
positionTo: button
}).then(function (id) {
switch (id) {
case 'download':
downloadRemoteSubtitles(context, subtitleId);
break;
@ -414,7 +332,6 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
break;
}
});
});
}
@ -427,12 +344,10 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function showEditorInternal(itemId, serverId, template) {
hasChanges = false;
var apiClient = connectionManager.getApiClient(serverId);
return apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(function (item) {
var dialogOptions = {
removeOnClose: true,
scrollY: false
@ -470,19 +385,15 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
dlg.querySelector('.subtitleResults').addEventListener('click', onSubtitleResultsClick);
apiClient.getCultures().then(function (languages) {
fillLanguages(editorContent, apiClient, languages);
});
dlg.querySelector('.btnCancel').addEventListener('click', function () {
dialogHelper.close(dlg);
});
return new Promise(function (resolve, reject) {
dlg.addEventListener('close', function () {
if (layoutManager.tv) {
centerFocus(dlg.querySelector('.formDialogContent'), false, false);
}
@ -502,17 +413,13 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
}
function showEditor(itemId, serverId) {
loading.show();
return new Promise(function (resolve, reject) {
require(['text!./subtitleeditor.template.html'], function (template) {
showEditorInternal(itemId, serverId, template).then(resolve, reject);
});
});
}
return {