Many small fixes.

dev/App/Abstract.js

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

dev/Common/HtmlEditor.js

@@ -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
 			});

dev/Common/Utils.js

@@ -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;

dev/Styles/Layout.less

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

dev/View/Popup/Compose.js

@@ -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();

dev/View/User/Login.js

@@ -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};

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -1455,9 +1455,7 @@ class Actions
 			'customLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
 			'forgotPasswordLinkUrl' => \trim($oConfig->Get('login', 'forgot_password_link_url', '')),
 			'registrationLinkUrl' => \trim($oConfig->Get('login', 'registration_link_url', '')),
-			'loginGlassStyle' => (bool) $oConfig->Get('login', 'glass_style', true),
 			'hideSubmitButton' => (bool) $oConfig->Get('login', 'hide_submit_button', true),
-			'activeBackgroud' => (bool) $oConfig->Get('login', 'active_backgroud', false),
 			'jsHash' => \md5(\RainLoop\Utils::GetConnectionToken()),
 			'useImapThread' => (bool) $oConfig->Get('labs', 'use_imap_thread', false),
 			'useImapSubscribe' => (bool) $oConfig->Get('labs', 'use_imap_list_subscribe', true),

rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php

@@ -251,9 +251,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 
 				'welcome_page' => array(false, ''),
 
-				'glass_style' => array(true),
 				'hide_submit_button' => array(true),
-				'active_backgroud' => array(false),
 
 				'forgot_password_link_url' => array('', ''),
 				'registration_link_url' => array('', ''),

rainloop/v/0.0.0/app/templates/Index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="no-js rl-booted-trigger rl-started-trigger" dir="{{BaseDir}}">
+<html class="no-js rl-booted-trigger rl-started-trigger glass" dir="{{BaseDir}}">
 	<head>
 		<noscript>
 			<meta http-equiv="refresh" content="0; URL=./?/NoScript" />

vendors/ckeditor-plugins/signature/plugin.js

@@ -3,7 +3,7 @@
 
 	'use strict';
 
-	var rl_signature_replacer = function(editor, text, signature, isHtml, insertBefore, isFirst) {
+	var rl_signature_replacer = function(editor, text, signature, isHtml, insertBefore) {
 
 		var
 			skipInsert = false,
@@ -60,19 +60,7 @@
 
 		if (!skipInsert)
 		{
-			if (isEmptyText)
+			signature = newLine + newLine + (isHtml ? '<signature>' : '') + signature + (isHtml ? '</signature>' : '');
-			{
-				signature = newLine + newLine + signature;
-			}
-			else
-			{
-				signature = insertBefore ? signature + newLine + newLine : newLine + newLine + signature;
-			}
-
-			if (isHtml)
-			{
-				signature = '<signature>' + signature + '</signature>';
-			}
 
 			text = insertBefore ? signature + text : text + signature;
 
@@ -101,7 +89,6 @@
 
 					var
 						bIsHtml = false,
-						bIsFirst = false,
 						bInsertBefore = false,
 						sSignature = '',
 						sResultSignature = '';
@@ -109,7 +96,6 @@
 					if (cfg)
 					{
 						bIsHtml = undefined === cfg.isHtml ? false : !!cfg.isHtml;
-						bIsFirst = undefined === cfg.isFirst ? false : !!cfg.isFirst;
 						bInsertBefore = undefined === cfg.insertBefore ? false : !!cfg.insertBefore;
 						sSignature = undefined === cfg.signature ? '' : cfg.signature;
 					}
@@ -129,7 +115,7 @@
 							}
 
 							editor.__plain.setRawData(
-								rl_signature_replacer(editor, editor.__plain.getRawData(), sResultSignature, false, bInsertBefore, bIsFirst));
+								rl_signature_replacer(editor, editor.__plain.getRawData(), sResultSignature, false, bInsertBefore));
 
 						}
 						else
@@ -143,7 +129,7 @@
 							}
 
 							editor.setData(
-								rl_signature_replacer(editor, editor.getData(), sResultSignature, true, bInsertBefore, bIsFirst));
+								rl_signature_replacer(editor, editor.getData(), sResultSignature, true, bInsertBefore));
 						}
 					}
 					catch (e) {}