Merge pull request #7943 from RocketChat/firefox-emoji

[FIX] Broken emoji picker on firefox
RocketChat · Aug 30, 2017 · fc3fd84 · fc3fd84
1 parent 5568591
commit fc3fd84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/packages/rocketchat-emoji/client/emojiButton.js b/packages/rocketchat-emoji/client/emojiButton.js
@@ -14,9 +14,7 @@ Template.messageBox.events({
 				const caretPos = input.selectionStart;
 				const textAreaTxt = input.value;
 				input.focus();
-				if (document.execCommand) {
-					document.execCommand('insertText', false, emojiValue);
-				} else {
+				if (!document.execCommand || !document.execCommand('insertText', false, emojiValue)) {
 					input.value = textAreaTxt.substring(0, caretPos) + emojiValue + textAreaTxt.substring(caretPos);
 				}
 

diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
@@ -51,11 +51,10 @@ function applyMd(e, t) {
 			box.selectionStart = selectionStart - startPattern.length;
 			box.selectionEnd = selectionEnd + endPattern.length;
 
-			if (document.execCommand) {
-				document.execCommand('insertText', false, selectedText);
-			} else {
+			if (!document.execCommand || !document.execCommand('insertText', false, selectedText)) {
 				box.value = initText.substr(0, initText.length - startPattern.length) + selectedText + finalText.substr(endPattern.length);
 			}
+
 			box.selectionStart = selectionStart - startPattern.length;
 			box.selectionEnd = box.selectionStart + selectedText.length;
 			$(box).change();
@@ -68,11 +67,10 @@ function applyMd(e, t) {
 		apply pattern
 		restore selection
 	*/
-	if (document.execCommand) {
-		document.execCommand('insertText', false, this.pattern.replace('{{text}}', selectedText));
-	} else {
+	if (!document.execCommand || !document.execCommand('insertText', false, this.pattern.replace('{{text}}', selectedText))) {
 		box.value = initText + this.pattern.replace('{{text}}', selectedText) + finalText;
 	}
+
 	box.selectionStart = selectionStart + this.pattern.indexOf('{{text}}');
 	box.selectionEnd = box.selectionStart + selectedText.length;
 	$(box).change();