mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-06-27 08:46:44 +03:00
Globalize rl.loadScript()
This commit is contained in:
parent
0106751e64
commit
cd734c7d5d
3 changed files with 14 additions and 15 deletions
|
|
@ -55,17 +55,13 @@ export const
|
|||
leftmargin: (value, node) => node.style.marginLeft = pInt(value) + 'px',
|
||||
bottommargin: (value, node) => node.style.marginBottom = pInt(value) + 'px',
|
||||
rightmargin: (value, node) => node.style.marginRight = pInt(value) + 'px'
|
||||
};
|
||||
|
||||
// if (static::Config()->Get('labs', 'strict_html_parser', true))
|
||||
let
|
||||
value,
|
||||
},
|
||||
allowedAttributes = [
|
||||
// defaults
|
||||
'name',
|
||||
'dir', 'lang', 'style', 'title',
|
||||
'background', 'bgcolor', 'alt', 'height', 'width', 'src', 'href',
|
||||
'border', 'bordercolor', 'charset', 'direction', 'language',
|
||||
'border', 'bordercolor', 'charset', 'direction',
|
||||
// a
|
||||
'download', 'hreflang',
|
||||
// body
|
||||
|
|
@ -178,6 +174,8 @@ export const
|
|||
}
|
||||
}
|
||||
|
||||
let value;
|
||||
|
||||
if ('TABLE' === name) {
|
||||
if (hasAttribute('width')) {
|
||||
oStyle.width = getAttribute('width');
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { doc, createElement, SettingsCapa, SettingsGet } from 'Common/Globals';
|
||||
import { SettingsCapa, SettingsGet } from 'Common/Globals';
|
||||
import { staticLink } from 'Common/Links';
|
||||
|
||||
//import { showScreenPopup } from 'Knoin/Knoin';
|
||||
|
|
@ -22,13 +22,12 @@ export const
|
|||
|
||||
init() {
|
||||
if (SettingsCapa('OpenPGP') && window.crypto && crypto.getRandomValues) {
|
||||
const script = createElement('script', {src:staticLink('js/min/openpgp.min.js')});
|
||||
script.onload = () => this.loadKeyrings();
|
||||
script.onerror = () => {
|
||||
this.loadKeyrings();
|
||||
console.error(script.src);
|
||||
};
|
||||
doc.head.append(script);
|
||||
rl.loadScript(staticLink('js/min/openpgp.min.js'))
|
||||
.then(() => this.loadKeyrings())
|
||||
.catch(e => {
|
||||
this.loadKeyrings();
|
||||
console.error(e);
|
||||
});
|
||||
} else {
|
||||
this.loadKeyrings();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,9 @@ win.rl = {
|
|||
setData: appData => {
|
||||
RL_APP_DATA = appData;
|
||||
rl.app.refresh();
|
||||
}
|
||||
},
|
||||
|
||||
loadScript: loadScript
|
||||
};
|
||||
|
||||
loadScript(`./?/${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue