mirror of
https://github.com/the-djmaze/snappymail.git
synced 2025-01-18 04:40:30 +08:00
Replace missed $.ajax with window.fetch
This commit is contained in:
parent
dca0ff02ed
commit
134cb7d52a
2 changed files with 28 additions and 22 deletions
|
@ -263,13 +263,23 @@ export function reload(admin, language) {
|
|||
|
||||
$htmlCL.add('rl-changing-language');
|
||||
|
||||
return new window.Promise((resolve, reject) => {
|
||||
$.ajax({
|
||||
url: langLink(language, admin),
|
||||
dataType: 'script',
|
||||
cache: true
|
||||
}).then(
|
||||
() => {
|
||||
return new Promise((resolve, reject) => {
|
||||
return window.fetch(langLink(language, admin), {cache: 'reload'})
|
||||
.then(response => {
|
||||
if (response.ok) {
|
||||
const type = response.headers.get('Content-Type');
|
||||
if (type.includes('application/javascript')) {
|
||||
return response.text();
|
||||
}
|
||||
}
|
||||
reject(new Error('Invalid response'))
|
||||
}, error => {
|
||||
reject(new Error(error.message))
|
||||
})
|
||||
.then(data => {
|
||||
var doc = window.document, script = doc.createElement('script');
|
||||
script.text = data;
|
||||
doc.head.appendChild(script).parentNode.removeChild(script);
|
||||
setTimeout(
|
||||
() => {
|
||||
reloadData();
|
||||
|
@ -277,20 +287,14 @@ export function reload(admin, language) {
|
|||
const isRtl = ['ar', 'ar_sa', 'he', 'he_he', 'ur', 'ur_ir'].includes((language || '').toLowerCase());
|
||||
|
||||
$htmlCL.remove('rl-changing-language', 'rl-rtl', 'rl-ltr');
|
||||
// $html.attr('dir', isRtl ? 'rtl' : 'ltr')
|
||||
// $html.attr('dir', isRtl ? 'rtl' : 'ltr')
|
||||
$htmlCL.add(isRtl ? 'rl-rtl' : 'rl-ltr');
|
||||
|
||||
resolve();
|
||||
},
|
||||
500 < microtime() - start ? 1 : 500
|
||||
);
|
||||
},
|
||||
() => {
|
||||
$htmlCL.remove('rl-changing-language');
|
||||
window.rainloopI18N = null;
|
||||
reject();
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -1161,15 +1161,17 @@ export function changeTheme(value, themeTrigger = noop) {
|
|||
|
||||
themeTrigger(SaveSettingsStep.Animate);
|
||||
|
||||
if (__themeAjax && __themeAjax.abort) {
|
||||
if (__themeAjax) {
|
||||
__themeAjax.abort();
|
||||
}
|
||||
|
||||
__themeAjax = $.ajax({
|
||||
url: url,
|
||||
dataType: 'json'
|
||||
})
|
||||
.then((data) => {
|
||||
let init = {};
|
||||
if (window.AbortController) {
|
||||
__themeAjax = new window.AbortController();
|
||||
init.signal = __themeAjax.signal;
|
||||
}
|
||||
window.fetch(url, init)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data && isArray(data) && 2 === data.length) {
|
||||
if (themeLink && themeLink[0] && (!themeStyle || !themeStyle[0])) {
|
||||
themeStyle = $('<style id="app-theme-style"></style>');
|
||||
|
|
Loading…
Reference in a new issue