Release fixes

Additional branding options
fixes (php mail functionality)

dev/App/User.js

@@ -1060,7 +1060,32 @@
 			oTop = null,
 			oBottom = null,
 
-			fResizeFunction = function (oEvent, oObject) {
+			fResizeCreateFunction = function (oEvent) {
+				if (oEvent && oEvent.target)
+				{
+					var oResizableHandle = $(oEvent.target).find('.ui-resizable-handle');
+
+					oResizableHandle
+						.on('mousedown', function () {
+							Globals.$html.addClass('rl-resizer');
+						})
+						.on('mouseup', function () {
+							Globals.$html.removeClass('rl-resizer');
+						})
+					;
+				}
+			},
+
+			fResizeStartFunction = function () {
+				Globals.$html.addClass('rl-resizer');
+			},
+
+			fResizeResizeFunction = _.debounce(function () {
+				Globals.$html.addClass('rl-resizer');
+			}, 500, true),
+
+			fResizeStopFunction = function (oEvent, oObject) {
+				Globals.$html.removeClass('rl-resizer');
 				if (oObject && oObject.size && oObject.size.height)
 				{
 					Local.set(sClientSideKeyName, oObject.size.height);
@@ -1076,7 +1101,10 @@
 				'minHeight': iMinHeight,
 				'maxHeight': iMaxHeight,
 				'handles': 's',
-				'stop': fResizeFunction
+				'create': fResizeCreateFunction,
+				'resize': fResizeResizeFunction,
+				'start': fResizeStartFunction,
+				'stop': fResizeStopFunction
 			},
 
 			fSetHeight = function (iHeight) {
@@ -1169,8 +1197,29 @@
 					fSetWidth(iWidth > iMinWidth ? iWidth : iMinWidth);
 				}
 			},
+			fResizeCreateFunction = function (oEvent) {
+				if (oEvent && oEvent.target)
+				{
+					var oResizableHandle = $(oEvent.target).find('.ui-resizable-handle');
 
-			fResizeFunction = function (oEvent, oObject) {
+					oResizableHandle
+						.on('mousedown', function () {
+							Globals.$html.addClass('rl-resizer');
+						})
+						.on('mouseup', function () {
+							Globals.$html.removeClass('rl-resizer');
+						})
+					;
+				}
+			},
+			fResizeResizeFunction = _.debounce(function () {
+				Globals.$html.addClass('rl-resizer');
+			}, 500, true),
+			fResizeStartFunction = function () {
+				Globals.$html.addClass('rl-resizer');
+			},
+			fResizeStopFunction = function (oEvent, oObject) {
+				Globals.$html.removeClass('rl-resizer');
 				if (oObject && oObject.size && oObject.size.width)
 				{
 					Local.set(sClientSideKeyName, oObject.size.width);
@@ -1192,7 +1241,10 @@
 			'minWidth': iMinWidth,
 			'maxWidth': 350,
 			'handles': 'e',
-			'stop': fResizeFunction
+			'create': fResizeCreateFunction,
+			'resize': fResizeResizeFunction,
+			'start': fResizeStartFunction,
+			'stop': fResizeStopFunction
 		});
 
 		Events.sub('left-panel.off', function () {

dev/Common/HtmlEditor.js

@@ -196,6 +196,8 @@
 		{
 			this.modeToggle(true);
 
+			sHtml = sHtml.replace(/<[pP][^>]*><\/[pP]>/g, '');
+
 			try {
 				this.editor.setData(sHtml);
 			} catch (e) {}

dev/Common/Utils.js

@@ -867,6 +867,7 @@
 
 		sText = sHtml
 			.replace(/\u0002([\s\S]*)\u0002/gm, '\u200C$1\u200C')
+			.replace(/<[pP][^>]*><\/[pP]>/g, '')
 			.replace(/<pre[^>]*>([\s\S\r\n]*)<\/pre>/gmi, convertPre)
 			.replace(/[\s]+/gm, ' ')
 			.replace(/((?:href|data)\s?=\s?)("[^"]+?"|'[^']+?')/gmi, fixAttibuteValue)

dev/Settings/Admin/Branding.js

@@ -42,6 +42,9 @@
 		this.userLogoMessage = ko.observable(Settings.settingsGet('UserLogoMessage') || '');
 		this.userLogoMessage.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 
+		this.userIframeMessage = ko.observable(Settings.settingsGet('UserIframeMessage') || '');
+		this.userIframeMessage.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
+
 		this.userLogoTitle = ko.observable(Settings.settingsGet('UserLogoTitle') || '');
 		this.userLogoTitle.trigger = ko.observable(Enums.SaveSettingsStep.Idle);
 

dev/Styles/MessageView.less

@@ -69,6 +69,22 @@ html.rl-no-preview-pane {
 			color: #DA4F49;
 		}
 
+		.b-message-view-iframe {
+		}
+
+		.b-message-view-iframe-backdrop {
+			display: none;
+			background: transparent;
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			top: 0px;
+			left: 0px;
+			right: 0px;
+			bottom: 0px;
+			opacity: .1;
+		}
+
 		.content {
 			-webkit-overflow-scrolling: touch;
 		}
@@ -453,6 +469,10 @@ html.rl-no-preview-pane {
 	}
 }
 
+html.rl-resizer .b-message-view-iframe-backdrop {
+	display: block !important;
+}
+
 html.rl-no-preview-pane .messageView {
 	.toolbar {
 		padding-left: @rlMainBorderSize;

dev/View/User/MailBox/MessageView.js

@@ -73,6 +73,7 @@
 		this.allowMessageListActions = !!Settings.capa(Enums.Capa.MessageListActions);
 
 		this.logoImg = Utils.trim(Settings.settingsGet('UserLogoMessage'));
+		this.logoIframe = Utils.trim(Settings.settingsGet('UserIframeMessage'));
 
 		this.attachmentsActions = AppStore.attachmentsActions;