Merge pull request #471 from amlitzer/iabbr-contenteditable

Make :iabbr work in contenteditable text boxes

Author: maxauthority

common/content/editor.js

@@ -447,12 +447,21 @@ const Editor = Module("editor", {
         let textbox   = Editor.getEditor();
         if (!textbox)
             return false;
-        let text      = textbox.value;
+        let text      = '';
+        let currStart = 0;
+        let currEnd   = 0;
+        if (textbox instanceof Window) {
+            text = textbox.getSelection().getRangeAt(0).startContainer.data;
+            currStart = textbox.getSelection().getRangeAt(0).startOffset;
+            currEnd = textbox.getSelection().getRangeAt(0).endOffset;
+        } else {
+            text = textbox.value;
+            currStart = textbox.selectionStart;
+            currEnd = textbox.selectionEnd;
+        }
         if (typeof text !== "string")
             return false;
 
-        let currStart = textbox.selectionStart;
-        let currEnd   = textbox.selectionEnd;
         let foundWord = text.substring(0, currStart).replace(/.*[\s\n]/gm, '').match(RegExp('(' + abbreviations._match + ')$'));
         if (!foundWord)
             return true;
@@ -462,10 +471,20 @@ const Editor = Module("editor", {
         if (abbrev) {
             let len = foundWord.length;
             let abbrText = abbrev.text;
-            text = text.substring(0, currStart - len) + abbrText + text.substring(currStart);
-            textbox.value = text;
-            textbox.selectionStart = currStart - len + abbrText.length;
-            textbox.selectionEnd   = currEnd   - len + abbrText.length;
+            if (textbox instanceof Window) {
+                let r = textbox.getSelection().getRangeAt(0);
+                r.setStart(r.startContainer, currStart - len);
+                r.deleteContents();
+                let textNode = document.createTextNode(abbrText);
+                r.insertNode(textNode);
+                r.selectNodeContents(textNode);
+                textbox.getSelection().collapseToEnd();
+            } else {
+                text = text.substring(0, currStart - len) + abbrText + text.substring(currStart);
+                textbox.value = text;
+                textbox.selectionStart = currStart - len + abbrText.length;
+                textbox.selectionEnd   = currEnd   - len + abbrText.length;
+            }
         }
 
         return true;