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

1.10.4.183

Browse source 
---
Fixes:
New login form style display problem since version 1.10.4 (#1196)
Collapse the TO: field in message view (#1199)
Paste with HTML tags fails (#1193)
This commit is contained in:
RainLoop Team 2016-09-29 00:40:17 +03:00
parent 224362299a
commit 0bbb2f14a4
21 changed files with 1947 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dev/View/Admin/Login.js
View file

@ -8,6 +8,7 @@ import {
import {StorageResultType, Notification, Magics} from 'Common/Enums';
import {getNotification} from 'Common/Translator';
import {$win} from 'Common/Globals';
import * as Settings from 'Storage/Settings';
@ -28,11 +29,13 @@ class LoginAdminView extends AbstractViewNext
constructor() {
super();
this.logoPowered = !!Settings.settingsGet('LoginPowered');
this.loginPowered = !!Settings.settingsGet('LoginPowered');
this.mobile = !!Settings.appSettingsGet('mobile');
this.mobileDevice = !!Settings.appSettingsGet('mobileDevice');
this.hideSubmitButton = !!Settings.appSettingsGet('hideSubmitButton');
this.login = ko.observable('');
this.password = ko.observable('');
@ -79,9 +82,13 @@ class LoginAdminView extends AbstractViewNext
}
this.submitRequest(true);
$win.trigger('rl.tooltips.diactivate');
Remote.adminLogin((sResult, oData) => {
$win.trigger('rl.tooltips.diactivate');
$win.trigger('rl.tooltips.activate');
if (StorageResultType.Success === sResult && oData && 'AdminLogin' === oData.Action)
{
if (oData.Result)

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

@ -17,6 +17,7 @@ import {
convertLangName, triggerAutocompleteInputChange
} from 'Common/Utils';
import {$win} from 'Common/Globals';
import {socialFacebook, socialGoogle, socialTwitter} from 'Common/Links';
import {getNotification, getNotificationFromResponse, reload as translatorReload} from 'Common/Translator';
@ -45,6 +46,8 @@ class LoginUserView extends AbstractViewNext
constructor() {
super();
this.hideSubmitButton = !!Settings.appSettingsGet('hideSubmitButton');
this.welcome = ko.observable(!!Settings.settingsGet('UseLoginWelcomePage'));
this.email = ko.observable('');
@ -59,7 +62,7 @@ class LoginUserView extends AbstractViewNext
this.additionalCodeSignMe = ko.observable(false);
this.logoImg = trim(Settings.settingsGet('LoginLogo'));
this.logoPowered = !!Settings.settingsGet('LoginPowered');
this.loginPowered = !!Settings.settingsGet('LoginPowered');
this.loginDescription = trim(Settings.settingsGet('LoginDescription'));
this.mobile = !!Settings.appSettingsGet('mobile');
@ -251,12 +254,16 @@ class LoginUserView extends AbstractViewNext
}
this.submitRequest(true);
$win.trigger('rl.tooltips.diactivate');
const
fLoginRequest = (sLoginPassword) => {
Remote.login((sResult, oData) => {
$win.trigger('rl.tooltips.diactivate');
$win.trigger('rl.tooltips.activate');
if (StorageResultType.Success === sResult && oData && 'Login' === oData.Action)
{
if (oData.Result)