Skip to content

Commit 0bbb2f1

Browse files
committed
1.10.4.183
--- Fixes: New login form style display problem since version 1.10.4 (RainLoop#1196) Collapse the TO: field in message view (RainLoop#1199) Paste with HTML tags fails (RainLoop#1193)
1 parent 2243622 commit 0bbb2f1

File tree

21 files changed

+1947
-140
lines changed

21 files changed

+1947
-140
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
### RainLoop version, browser, OS:
3+
4+
### Expected behavior and actual behavior:
5+
6+
### Steps to reproduce the problem:
7+
8+
### Logs or screenshots:

dev/App/Abstract.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ class AbstractApp extends AbstractBoot
256256
if (logout && window.location.href !== customLogoutLink)
257257
{
258258
_.delay(() => {
259+
259260
if (inIframe && window.parent)
260261
{
261262
window.parent.location.href = customLogoutLink;
@@ -264,6 +265,9 @@ class AbstractApp extends AbstractBoot
264265
{
265266
window.location.href = customLogoutLink;
266267
}
268+
269+
$win.trigger('rl.tooltips.diactivate');
270+
267271
}, Magics.Time100ms);
268272
}
269273
else
@@ -273,6 +277,7 @@ class AbstractApp extends AbstractBoot
273277
routeOff();
274278

275279
_.delay(() => {
280+
276281
if (inIframe && window.parent)
277282
{
278283
window.parent.location.reload();
@@ -281,6 +286,9 @@ class AbstractApp extends AbstractBoot
281286
{
282287
window.location.reload();
283288
}
289+
290+
$win.trigger('rl.tooltips.diactivate');
291+
284292
}, Magics.Time100ms);
285293
}
286294
}

dev/External/ko.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,15 @@ ko.bindingHandlers.tooltip = {
208208
{
209209
element.__opentip.setContent(sValue);
210210
}
211+
212+
$win.on('rl.tooltips.diactivate', () => {
213+
element.__opentip.hide();
214+
element.__opentip.deactivate();
215+
});
216+
217+
$win.on('rl.tooltips.activate', () => {
218+
element.__opentip.activate();
219+
});
211220
}
212221
},
213222
update: (element, fValueAccessor) => {

dev/Styles/MessageView.less

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,15 @@ html.rl-no-preview-pane {
182182
.informationShort {
183183
margin-left: 5px;
184184
margin-right: 50px;
185+
185186
a {
186187
.g-ui-link;
187188
}
188189

189190
&.-bottom {
190191
margin-right: 5px;
192+
max-height: 100px;
193+
overflow-y: auto;
191194
}
192195

193196
html.rl-mobile &{

dev/Styles/_End.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,3 +100,13 @@ svg-icon {
100100
transform: scale(.95);
101101
}
102102
}
103+
104+
html.glass {
105+
input:-webkit-autofill,
106+
input:-webkit-autofill:hover,
107+
input:-webkit-autofill:focus,
108+
input:-webkit-autofill:active {
109+
-webkit-transition-delay: 9999s;
110+
-webkit-transition: color 9999s ease-out, background-color 9999s ease-out;
111+
}
112+
}

dev/View/Admin/Login.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88

99
import {StorageResultType, Notification, Magics} from 'Common/Enums';
1010
import {getNotification} from 'Common/Translator';
11+
import {$win} from 'Common/Globals';
1112

1213
import * as Settings from 'Storage/Settings';
1314

@@ -28,11 +29,13 @@ class LoginAdminView extends AbstractViewNext
2829
constructor() {
2930
super();
3031

31-
this.logoPowered = !!Settings.settingsGet('LoginPowered');
32+
this.loginPowered = !!Settings.settingsGet('LoginPowered');
3233

3334
this.mobile = !!Settings.appSettingsGet('mobile');
3435
this.mobileDevice = !!Settings.appSettingsGet('mobileDevice');
3536

37+
this.hideSubmitButton = !!Settings.appSettingsGet('hideSubmitButton');
38+
3639
this.login = ko.observable('');
3740
this.password = ko.observable('');
3841

@@ -79,9 +82,13 @@ class LoginAdminView extends AbstractViewNext
7982
}
8083

8184
this.submitRequest(true);
85+
$win.trigger('rl.tooltips.diactivate');
8286

8387
Remote.adminLogin((sResult, oData) => {
8488

89+
$win.trigger('rl.tooltips.diactivate');
90+
$win.trigger('rl.tooltips.activate');
91+
8592
if (StorageResultType.Success === sResult && oData && 'AdminLogin' === oData.Action)
8693
{
8794
if (oData.Result)

dev/View/User/Login.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
convertLangName, triggerAutocompleteInputChange
1818
} from 'Common/Utils';
1919

20+
import {$win} from 'Common/Globals';
2021
import {socialFacebook, socialGoogle, socialTwitter} from 'Common/Links';
2122
import {getNotification, getNotificationFromResponse, reload as translatorReload} from 'Common/Translator';
2223

@@ -45,6 +46,8 @@ class LoginUserView extends AbstractViewNext
4546
constructor() {
4647
super();
4748

49+
this.hideSubmitButton = !!Settings.appSettingsGet('hideSubmitButton');
50+
4851
this.welcome = ko.observable(!!Settings.settingsGet('UseLoginWelcomePage'));
4952

5053
this.email = ko.observable('');
@@ -59,7 +62,7 @@ class LoginUserView extends AbstractViewNext
5962
this.additionalCodeSignMe = ko.observable(false);
6063

6164
this.logoImg = trim(Settings.settingsGet('LoginLogo'));
62-
this.logoPowered = !!Settings.settingsGet('LoginPowered');
65+
this.loginPowered = !!Settings.settingsGet('LoginPowered');
6366
this.loginDescription = trim(Settings.settingsGet('LoginDescription'));
6467

6568
this.mobile = !!Settings.appSettingsGet('mobile');
@@ -251,12 +254,16 @@ class LoginUserView extends AbstractViewNext
251254
}
252255

253256
this.submitRequest(true);
257+
$win.trigger('rl.tooltips.diactivate');
254258

255259
const
256260
fLoginRequest = (sLoginPassword) => {
257261

258262
Remote.login((sResult, oData) => {
259263

264+
$win.trigger('rl.tooltips.diactivate');
265+
$win.trigger('rl.tooltips.activate');
266+
260267
if (StorageResultType.Success === sResult && oData && 'Login' === oData.Action)
261268
{
262269
if (oData.Result)

0 commit comments

Comments
 (0)