Merge branch 'es6' into migrate-to-ES6-36

This commit is contained in:
dkanada 2020-07-23 11:54:21 +09:00 committed by GitHub
commit 20324144af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 802 additions and 730 deletions

View file

@ -90,7 +90,7 @@ function save(instance, context, userId, userSettings, apiClient, enableSaveConf
loading.hide();
if (enableSaveConfirmation) {
require(['toast'], function (toast) {
import('toast').then(({default: toast}) => {
toast(globalize.translate('SettingsSaved'));
});
}
@ -130,7 +130,7 @@ function onAppearanceFieldChange(e) {
function embed(options, self) {
require(['text!./subtitlesettings.template.html'], function (template) {
import('text!./subtitlesettings.template.html').then(({default: template}) => {
options.element.classList.add('subtitlesettings');
options.element.innerHTML = globalize.translateHtml(template, 'core');