Update codeit.js

Author: benhatsor

lib/codeit.js

@@ -1416,6 +1416,45 @@ class CodeitElement extends HTMLElement {
 
       function getCaretTextNode(caretPosInText) {
 
+        if (caretPosInText === cd.textContent.length) {
+          
+          function getLastNode(parentNode) {
+            
+            // if parent has child nodes
+            if (parentNode.childNodes.length > 0) {
+              
+              const lastNode = parentNode.childNodes[parentNode.childNodes.length-1];
+
+              // if found a text node
+              if (lastNode.nodeType === 3) {
+
+                // return
+                return lastNode;
+
+              } else { // continue recursive call
+
+                return getLastNode(lastNode);
+
+              }
+              
+            } else {
+              
+              // return
+              return parentNode;
+              
+            }
+            
+          }
+          
+          // get end node
+          const endNode = getLastNode(cd);
+          const endOffset = (endNode.nodeValue || endNode.textContent).length;
+          
+          return [endNode, endOffset];
+          
+        }
+        
+        
         let overallLength = 0,
             lastNode;
 
@@ -1505,62 +1544,17 @@ class CodeitElement extends HTMLElement {
         };
 
       } else {
-        
-        if (startPos === cd.textContent.length) {
-          
-          function getLastNode(parentNode) {
-            
-            // if parent has child nodes
-            if (parentNode.childNodes.length > 0) {
-              
-              const lastNode = parentNode.childNodes[parentNode.childNodes.length-1];
-
-              // if found a text node
-              if (lastNode.nodeType === 3) {
-
-                // return
-                return lastNode;
 
-              } else { // continue recursive call
+        // get start nodes
+        const [startNode, startOffset] = getCaretTextNode(startPos);
 
-                return getLastNode(lastNode);
+        return {
+          startNode: startNode,
+          startOffset: startOffset,
+          endNode: startNode,
+          endOffset: startOffset
+        };
 
-              }
-              
-            } else {
-              
-              // return
-              return parentNode;
-              
-            }
-            
-          }
-          
-          // get end node
-          const endNode = getLastNode(cd);
-          const endOffset = (endNode.nodeValue || endNode.textContent).length;
-          
-          return {
-            startNode: endNode,
-            startOffset: endOffset,
-            endNode: endNode,
-            endOffset: endOffset
-          };
-          
-        } else {
-          
-          // get start nodes
-          const [startNode, startOffset] = getCaretTextNode(startPos);
-
-          return {
-            startNode: startNode,
-            startOffset: startOffset,
-            endNode: startNode,
-            endOffset: startOffset
-          };
-          
-        }
-        
       }
 
     }