Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Interface redesign (attachments, new preview pane layout)

Browse source
This commit is contained in:
RainLoop Team 2015-01-04 23:30:07 +04:00
parent 6755a0ce51
commit e3e7c1d963
64 changed files with 1286 additions and 1009 deletions
Download patch file Download diff file Expand all files Collapse all files

51
dev/App/User.js
View file

@ -1315,26 +1315,6 @@
bTwitter = Settings.settingsGet('AllowTwitterSocial')
;
// Utils.initOnStartOrLangChange(function () {
//
// $.extend(true, $.magnificPopup.defaults, {
// 'tClose': Utils.i18n('PREVIEW_POPUP/CLOSE'),
// 'tLoading': Utils.i18n('PREVIEW_POPUP/LOADING'),
// 'gallery': {
// 'tPrev': Utils.i18n('PREVIEW_POPUP/GALLERY_PREV'),
// 'tNext': Utils.i18n('PREVIEW_POPUP/GALLERY_NEXT'),
// 'tCounter': Utils.i18n('PREVIEW_POPUP/GALLERY_COUNTER')
// },
// 'image': {
// 'tError': Utils.i18n('PREVIEW_POPUP/IMAGE_ERROR')
// },
// 'ajax': {
// 'tError': Utils.i18n('PREVIEW_POPUP/AJAX_ERROR')
// }
// });
//
// }, this);
if (SimplePace)
{
SimplePace.set(70);
@ -1359,18 +1339,29 @@
{
if ($LAB && window.crypto && window.crypto.getRandomValues && Settings.capa(Enums.Capa.OpenPGP))
{
$LAB.script(window.openpgp ? '' : Links.openPgpJs()).wait(function () {
if (window.openpgp)
{
Data.openpgp = window.openpgp;
Data.openpgpKeyring = new window.openpgp.Keyring();
Data.capaOpenPGP(true);
var fOpenpgpCallback = function (openpgp) {
Data.openpgp = openpgp;
Data.openpgpKeyring = new openpgp.Keyring();
Data.capaOpenPGP(true);
Events.pub('openpgp.init');
Events.pub('openpgp.init');
self.reloadOpenPgpKeys();
}
});
self.reloadOpenPgpKeys();
};
if (window.openpgp)
{
fOpenpgpCallback(window.openpgp);
}
else
{
$LAB.script(Links.openPgpJs()).wait(function () {
if (window.openpgp)
{
fOpenpgpCallback(window.openpgp);
}
});
}
}
else
{