From 4c6fd9cdd1c73d8a212d6bf7e63afb57ebd4a3e6 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Mon, 16 Feb 2015 05:21:18 +0400
Subject: [PATCH] Signature builder small changes

---
 dev/Settings/User/Accounts.js                          |  9 ---------
 dev/View/Popup/Compose.js                              |  6 +++---
 .../app/templates/Views/User/SettingsAccounts.html     | 10 +++++-----
 .../0.0.0/static/ckeditor/plugins/signature/plugin.js  |  7 +++++--
 vendors/ckeditor-plugins/signature/plugin.js           |  7 +++++--
 vendors/rl/rl.js                                       |  2 +-
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index ac49ffb26..98982210d 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -9,7 +9,6 @@
 		ko = require('ko'),
 
 		Enums = require('Common/Enums'),
-		Translator = require('Common/Translator'),
 		Links = require('Common/Links'),
 
 		AccountStore = require('Stores/User/Account'),
@@ -26,14 +25,6 @@
 		this.accounts = AccountStore.accounts;
 		this.identities = IdentityStore.identities;
 
-		this.processText = ko.computed(function () {
-			return AccountStore.accounts.loading() ? Translator.i18n('SETTINGS_ACCOUNTS/LOADING_PROCESS') : '';
-		}, this);
-
-		this.visibility = ko.computed(function () {
-			return '' === this.processText() ? 'hidden' : 'visible';
-		}, this);
-
 		this.accountForDeletion = ko.observable(null).deleteAccessHelper();
 		this.identityForDeletion = ko.observable(null).deleteAccessHelper();
 	}
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 4d18b1701..a499c17ed 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1131,8 +1131,8 @@
 						'EMAIL': sFrom
 					});
 
-					sText = '<br />' + sReplyTitle + ':' +
-						'<blockquote><p>' + sText + '</p></blockquote>';
+					sText = '<br /><br />' + sReplyTitle + ':' +
+						'<blockquote><p>' + Utils.trim(sText) + '</p></blockquote>';
 
 					break;
 
@@ -1146,7 +1146,7 @@
 							(0 < sCc.length ? '<br />' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_CC') + ': ' + sCc : '') +
 							'<br />' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_SENT') + ': ' + Utils.encodeHtml(sDate) +
 							'<br />' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_SUBJECT') + ': ' + Utils.encodeHtml(sSubject) +
-							'<br /><br />' + sText;
+							'<br /><br />' + Utils.trim(sText) + '<br /><br />';
 					break;
 				case Enums.ComposeType.ForwardAsAttachment:
 					sText = '';
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html b/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
index 958b34276..cbc59e5ad 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/SettingsAccounts.html
@@ -2,6 +2,8 @@
 	<div class="form-horizontal">
 		<div class="legend">
 			<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
+			&nbsp;&nbsp;&nbsp;
+			<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: accounts.loading"></i>
 		</div>
 	</div>
 	<a class="btn" data-bind="click: addNewAccount">
@@ -9,11 +11,9 @@
 		&nbsp;&nbsp;
 		<span class="i18n" data-i18n-text="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
 	</a>
-	<div class="process-place" data-bind="style: {'visibility': visibility }">
-		<i class="icon-spinner animated"></i>
-		&nbsp;&nbsp;
-		<span data-bind="text: processText"></span>
-	</div>
+	<br />
+	<br />
+	<br />
 	<table class="table table-hover list-table accounts-list" data-bind="i18nUpdate: accounts">
 		<colgroup>
 			<col />
diff --git a/rainloop/v/0.0.0/static/ckeditor/plugins/signature/plugin.js b/rainloop/v/0.0.0/static/ckeditor/plugins/signature/plugin.js
index 5355eb605..00c0e0a30 100644
--- a/rainloop/v/0.0.0/static/ckeditor/plugins/signature/plugin.js
+++ b/rainloop/v/0.0.0/static/ckeditor/plugins/signature/plugin.js
@@ -2,13 +2,16 @@
 rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefore)
 {
 	var
-		bEmptyText = '' === $.trim(sText),
+		sTextWithoutSignature = sText
+			.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, '')
+			.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, ''),
+		bEmptyText = '' === $.trim(sTextWithoutSignature),
 		sNewLine = (bHtml ? '<br />' : "\n")
 	;
 
 	if (!bEmptyText && bHtml)
 	{
-		bEmptyText = '' !== $.trim(editor.__plainUtils.htmlToPlain(sText));
+		bEmptyText = '' !== $.trim(editor.__plainUtils.htmlToPlain(sTextWithoutSignature));
 	}
 
 	if (!/\u0002\u0002/gm.test(sText))
diff --git a/vendors/ckeditor-plugins/signature/plugin.js b/vendors/ckeditor-plugins/signature/plugin.js
index 5355eb605..00c0e0a30 100644
--- a/vendors/ckeditor-plugins/signature/plugin.js
+++ b/vendors/ckeditor-plugins/signature/plugin.js
@@ -2,13 +2,16 @@
 rl_signature_replacer = function (editor, sText, sSignature, bHtml, bInsertBefore)
 {
 	var
-		bEmptyText = '' === $.trim(sText),
+		sTextWithoutSignature = sText
+			.replace(/\u0002\u0002[\s\S]*\u0003\u0003/gm, '')
+			.replace(/\u0004\u0004[\s\S]*\u0005\u0005/gm, ''),
+		bEmptyText = '' === $.trim(sTextWithoutSignature),
 		sNewLine = (bHtml ? '<br />' : "\n")
 	;
 
 	if (!bEmptyText && bHtml)
 	{
-		bEmptyText = '' !== $.trim(editor.__plainUtils.htmlToPlain(sText));
+		bEmptyText = '' !== $.trim(editor.__plainUtils.htmlToPlain(sTextWithoutSignature));
 	}
 
 	if (!/\u0002\u0002/gm.test(sText))
diff --git a/vendors/rl/rl.js b/vendors/rl/rl.js
index 98be30315..c938b36aa 100644
--- a/vendors/rl/rl.js
+++ b/vendors/rl/rl.js
@@ -6,7 +6,7 @@
 	 */
 	function CRLTopDriver() {}
 
-	CRLTopDriver.prototype.s = window['sessionStorage'];
+	CRLTopDriver.prototype.s = window['sessionStorage'] || null;
 
 	CRLTopDriver.prototype.t = window['top'] || window;