Improve cross-browsers compatiblity for text editor

2 files changed, 12 insertions, 16 deletions

diff --git a/assets/js/components/suggest-menu.js b/assets/js/components/suggest-menu.js
index d23e4c37..f1f44eaf 100644
--- a/assets/js/components/suggest-menu.js
+++ b/assets/js/components/suggest-menu.js
@@ -35,14 +35,17 @@ KB.component('suggest-menu', function(containerElement, options) {
     }
 
     function insertSelectedItem() {
+        containerElement.focus();
+
         var element = KB.find('.suggest-menu-item.active');
         var value = element.data('value');
         var trigger = element.data('trigger');
         var content = containerElement.value;
         var text = getLastWord(containerElement);
         var substitute = trigger + value + ' ';
-        var before = content.substring(0, containerElement.selectionStart - text.length);
-        var after = content.substring(containerElement.selectionEnd);
+        var selectionPosition = KB.utils.getSelectionPosition(containerElement);
+        var before = content.substring(0, selectionPosition.selectionStart - text.length);
+        var after = content.substring(selectionPosition.selectionEnd);
         var position = before.length + substitute.length;
 
         containerElement.value = before + substitute + after;
diff --git a/assets/js/components/text-editor.js b/assets/js/components/text-editor.js
index 9a185cf2..45b12b01 100644
--- a/assets/js/components/text-editor.js
+++ b/assets/js/components/text-editor.js
@@ -125,25 +125,18 @@ KB.component('text-editor', function (containerElement, options) {
 
             insertText(lines.join('\n'));
         }
+
+        setCursorBeforeClosingTag(tag, 1);
     }
 
     function insertText(replacedText) {
-        var result = false;
-
         textarea.focus();
 
-        // Fix issue with IE11 (last line with wrong position)
-        if (textarea.value.length < textarea.selectionStart) {
-            selectionStart = textarea.value.length;
-        } else {
-            selectionStart = textarea.selectionStart;
-        }
+        var result = false;
+        var selectionPosition = KB.utils.getSelectionPosition(textarea);
 
-        if (textarea.selectionStart === textarea.selectionEnd) {
-            selectionEnd = selectionStart;
-        } else {
-            selectionEnd = textarea.selectionEnd;
-        }
+        selectionStart = selectionPosition.selectionStart;
+        selectionEnd = selectionPosition.selectionEnd;
 
         if (document.queryCommandSupported('insertText')) {
             result = document.execCommand('insertText', false, replacedText);
@@ -154,7 +147,7 @@ KB.component('text-editor', function (containerElement, options) {
                 document.execCommand('ms-beginUndoUnit');
             } catch (error) {}
 
-            textarea.value = replaceTextRange(textarea.value, selectionStart, textarea.selectionEnd, replacedText);
+            textarea.value = replaceTextRange(textarea.value, selectionStart, selectionEnd, replacedText);
 
             try {
                 document.execCommand('ms-endUndoUnit');