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

Many small fixes.

Browse source
This commit is contained in:
RainLoop Team 2017-07-06 01:31:41 +03:00
parent 9188228f5d
commit ab374bbb71
13 changed files with 339 additions and 396 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dev/App/Abstract.js
View file

@ -340,11 +340,6 @@ class AbstractApp extends AbstractBoot
leftPanelDisabled(false);
});
if (Settings.appSettingsGet('loginGlassStyle'))
{
$html.addClass('glass');
}
if (!mobile)
{
ssm.addState({

3
dev/Common/HtmlEditor.js
View file

@ -92,12 +92,11 @@ class HtmlEditor
* @param {bool} insertBefore
* @returns {void}
*/
setSignature(signature, html, insertBefore = false, first = false) {
setSignature(signature, html, insertBefore = false) {
if (this.editor)
{
this.editor.execCommand('insertSignature', {
isHtml: html,
isFirst: first,
insertBefore: insertBefore,
signature: signature
});

2
dev/Common/Utils.js
View file

@ -826,7 +826,7 @@ export function htmlToPlain(html)
.replace(/&lt;/gi, '<')
.replace(/&amp;/gi, '&');
text = splitPlainText(trim(text));
text = splitPlainText(text);
pos = 0;
limit = 800;

5
dev/Styles/Layout.less
View file

@ -6,11 +6,6 @@
right: 0;
top: 0;
bottom: 0;
&.animated {
right: -25px;
bottom: -25px;
}
}
#rl-content {

10
dev/View/Popup/Compose.js
View file

@ -866,7 +866,7 @@ class ComposePopupView extends AbstractViewNext
return signature;
}
setSignatureFromIdentity(identity, first = false) {
setSignatureFromIdentity(identity) {
if (identity)
{
this.editor((editor) => {
@ -883,7 +883,7 @@ class ComposePopupView extends AbstractViewNext
}
}
editor.setSignature(this.converSignature(signature), isHtml, !!identity.signatureInsertBefore(), first);
editor.setSignature(this.converSignature(signature), isHtml, !!identity.signatureInsertBefore());
});
}
}
@ -1168,7 +1168,7 @@ class ComposePopupView extends AbstractViewNext
if (identity && ComposeType.Draft !== lineComposeType && ComposeType.EditAsNew !== lineComposeType)
{
this.setSignatureFromIdentity(identity, true);
this.setSignatureFromIdentity(identity);
}
this.setFocusInPopup();
@ -1192,7 +1192,7 @@ class ComposePopupView extends AbstractViewNext
if (identity)
{
this.setSignatureFromIdentity(identity, true);
this.setSignatureFromIdentity(identity);
}
this.setFocusInPopup();
@ -1216,7 +1216,7 @@ class ComposePopupView extends AbstractViewNext
if (identity && ComposeType.Draft !== lineComposeType && ComposeType.EditAsNew !== lineComposeType)
{
this.setSignatureFromIdentity(identity, true);
this.setSignatureFromIdentity(identity);
}
this.setFocusInPopup();

28
dev/View/User/Login.js
View file

@ -1,6 +1,5 @@
import window from 'window';
import $ from '$';
import _ from '_';
import ko from 'ko';
@ -457,11 +456,6 @@ class LoginUserView extends AbstractViewNext
}, Magics.Time50ms);
triggerAutocompleteInputChange(true);
if (Settings.appSettingsGet('activeBackgroud'))
{
this.initActiveBackgroud();
}
}
submitForm() {
@ -486,28 +480,6 @@ class LoginUserView extends AbstractViewNext
return true;
}
initActiveBackgroud() {
const
$bg = $('#rl-bg'),
movementStrength = 25,
winHeight = $win.height(),
winWidth = $win.width(),
height = movementStrength / winHeight,
width = movementStrength / winWidth,
winHeightHalf = winHeight / 2,
winWidthHalf = winWidth / 2;
$bg.addClass('animated');
$('#rl-app').on('mousemove', _.throttle((e) => {
$bg.css({
top: height * (e.pageY - winHeightHalf) * -1 - movementStrength,
left: width * (e.pageX - winWidthHalf) * -1 - movementStrength
});
}, 1));
}
}
export {LoginUserView, LoginUserView as default};