Compose focus fixes (#547)

dev/Common/HtmlEditor.js

@@ -384,7 +384,6 @@
 		this.setHtml('', bFocus);
 	};
 
-
 	module.exports = HtmlEditor;
 
 }());

dev/External/ko.js

@@ -688,6 +688,13 @@
 				'focusCallback': fFocusCallback,
 				'inputDelimiters': [',', ';'],
 				'autoCompleteSource': fAutoCompleteSource,
+//				'elementHook': function (oEl, oItem) {
+//					if (oEl && oItem)
+//					{
+//						oEl.addClass('pgp');
+//						window.console.log(arguments);
+//					}
+//				},
 				'parseHook': function (aInput) {
 					return _.map(aInput, function (sInputValue) {
 

dev/Styles/_InputosaurusFix.less

@@ -55,6 +55,10 @@
 		&.inputosaurus-selected {
 			background-color: #ddd;
 		}
+
+		&.pgp {
+			background-color: #E5F3E2;
+		}
 	}
 
 	.inputosaurus-input {

dev/View/Popup/Compose.js

@@ -751,6 +751,8 @@
 
 		this.bSkipNextHide = false;
 
+		this.to.focused(false);
+
 		kn.routeOn();
 	};
 
@@ -761,12 +763,14 @@
 			var self = this;
 			if (!this.oEditor && this.composeEditorArea())
 			{
+//_.delay(function () {
 				self.oEditor = new HtmlEditor(self.composeEditorArea(), null, function () {
 					fOnInit(self.oEditor);
 					self.resizerTrigger();
 				}, function (bHtml) {
 					self.isHtml(!!bHtml);
 				});
+//}, 1000);
 			}
 			else if (this.oEditor)
 			{
@@ -1226,6 +1230,10 @@
 				self.setFocusInPopup();
 			});
 		}
+		else
+		{
+			this.setFocusInPopup();
+		}
 
 		aDownloads = this.getAttachmentsDownloadsForUpload();
 		if (Utils.isNonEmptyArray(aDownloads))
@@ -1276,21 +1284,27 @@
 	{
 		if (!Globals.bMobileDevice)
 		{
-			if ('' === this.to())
+			var self = this;
+			_.delay(function () {
+
+				if ('' === self.to())
 				{
-				this.to.focused(false);
+					self.to.focused(true);
-				this.to.focused(true);
 				}
-			else if (this.oEditor)
+				else if (self.oEditor)
 				{
-				this.oEditor.focus();
+					if (!self.to.focused())
+					{
+						self.oEditor.focus();
 					}
 				}
+
+			}, 100);
+		}
 	};
 
 	ComposePopupView.prototype.onShowWithDelay = function ()
 	{
-		this.setFocusInPopup();
 		this.resizerTrigger();
 	};
 

vendors/inputosaurus/inputosaurus.js

@@ -64,6 +64,8 @@
 			// the array of tag names is passed and expected to be returned as an array after manipulation
 			parseHook : null,
 
+			elementHook : null,
+
 			// define a placeholder to display when the input is empty
 			placeholder: null
 		},
@@ -536,6 +538,8 @@
 					});
 				}
 
+				$.isFunction(this.options.elementHook) && (this.options.elementHook($li, obj));
+
 				return $li;
 			}
 		},