Merge pull request #110 from codeitcodes/dev

Dev

Author: benhatsor

filebrowser.js

@@ -833,7 +833,7 @@ const fileSizeText = '<this file is too big to view>';
 
 // push file to Git from HTML element
 async function pushFileFromHTML(fileEl, commitMessage) {
-
+  
   // disable pushing file in HTML
   fileEl.classList.remove('modified');
   bottomFloat.classList.remove('modified');
@@ -2439,11 +2439,17 @@ function setupEditor() {
             // compare current code with new code
             // if the code is different, swap it
             if (hashCode(selText) !== hashCode(beautifiedText)) {
-
+              
               // replace selection contents
               // with beautified text
               cd.deleteCurrentSelection();
-              cd.insert(beautifiedText);
+              cd.insert(beautifiedText, { moveToEnd: false });
+              
+              // get caret pos in text
+              const pos = cd.getSelection();
+    
+              // select beautified text
+              cd.setSelection(pos.start, (pos.start + beautifiedText.length));
 
               // dispatch type event (simulate typing)
               cd.dispatchTypeEvent();

lib/codeit.js

@@ -5,7 +5,7 @@
 /*
 
    codeit.js
-   v3.0.5
+   v3.0.6
    MIT License
 
    https://codeit.codes
@@ -282,6 +282,8 @@ class CodeitElement extends HTMLElement {
         && event.key !== 'Control'
         && event.key !== 'Alt'
         && event.key !== 'Shift'
+        && event.key !== 'CapsLock'
+        && event.key !== 'Escape'
 
         && !event.key.startsWith('Arrow')
         && !isCtrl(event);
@@ -352,14 +354,14 @@ class CodeitElement extends HTMLElement {
 
         if (cd.options.preserveIdent) handleDelNewLine(event);
 
-        if (cd.options.addClosing) handleSelfClosingCharacters(event);
-
         if (cd.options.preserveIdent) alignBracket(event);
 
       }
 
       if (cd.options.catchTab) handleTabCharacters(event);
 
+      if (cd.options.addClosing) handleSelfClosingCharacters(event);
+      
       if (cd.options.history) {
 
         handleUndoRedo(event);
@@ -637,13 +639,35 @@ class CodeitElement extends HTMLElement {
             // wrap the text with matching opening and closing chars
             const wrappedText = event.key + textToWrap + close[open.indexOf(event.key)];
 
+            // delete current selection
+            cd.deleteCurrentSelection();
+
             // insert wrapped text
-            cd.insert(wrappedText);
+            cd.insert(wrappedText, { moveToEnd: false });
+            
+            // get caret pos in text
+            const pos = cd.getSelection();
+            
+            // restore pos in text
+            cd.setSelection(pos.start, (pos.start + wrappedText.length));
 
           } else {
+            
+            // get caret pos in text
+            const pos = cd.getSelection();
+
+            // if cursor is on last line
+            if (pos.start === cd.textContent.length) {
+              
+              // insert newline
+              cd.insert((close[open.indexOf(event.key)] + '\n'), { moveToEnd: false });
+              
+            } else {
 
-            // insert matching closing char
-            cd.insert(close[open.indexOf(event.key)], { moveToEnd: false });
+              // insert matching closing char
+              cd.insert(close[open.indexOf(event.key)], { moveToEnd: false });
+              
+            }
 
           }
 
@@ -1414,6 +1438,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;
 
@@ -1503,62 +1566,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
-          };
-          
-        }
-        
       }
 
     }

worker/client-channel.js

@@ -4,7 +4,7 @@
 
 
 // update worker name when updating worker
-const WORKER_NAME = 'codeit-worker-v473';
+const WORKER_NAME = 'codeit-worker-v476';
 
 
 // internal paths