diff --git a/app/assets/javascripts/discourse/app/lib/utilities.js b/app/assets/javascripts/discourse/app/lib/utilities.js index 654eaeb353..980ea245b8 100644 --- a/app/assets/javascripts/discourse/app/lib/utilities.js +++ b/app/assets/javascripts/discourse/app/lib/utilities.js @@ -224,24 +224,7 @@ export function caretRowCol(el) { // Determine the position of the caret in an element export function caretPosition(el) { - let r, rc, re; - if (el.selectionStart) { - return el.selectionStart; - } - if (document.selection) { - el.focus(); - r = document.selection.createRange(); - if (!r) { - return 0; - } - - re = el.createTextRange(); - rc = re.duplicate(); - re.moveToBookmark(r.getBookmark()); - rc.setEndPoint("EndToStart", re); - return rc.text.length; - } - return 0; + return el?.selectionStart || 0; } // Set the caret's position diff --git a/vendor/assets/javascripts/caret_position.js b/vendor/assets/javascripts/caret_position.js index 2393c6f406..3a7ca2cee2 100644 --- a/vendor/assets/javascripts/caret_position.js +++ b/vendor/assets/javascripts/caret_position.js @@ -6,22 +6,11 @@ var clone = null; $.fn.caret = function(elem) { var getCaret = function(el) { - var r, rc, re; if (el.selectionStart) { return el.selectionStart; - } else if (document.selection) { - el.focus(); - r = document.selection.createRange(); - if (!r) return 0; - re = el.createTextRange(); - rc = re.duplicate(); - re.moveToBookmark(r.getBookmark()); - rc.setEndPoint("EndToStart", re); - return rc.text.length; } return 0; }; - return getCaret(elem || this[0]); };