Codeit 3.4.2

Patch 1

Author: benhatsor

filebrowser.js

@@ -398,38 +398,6 @@ async function renderSidebarHTML() {
 
   // if navigating in repository
   if (repo != '') {
-
-    // legacy modified file dir
-    
-    let modFilesChanged = false;
-
-    Object.values(modifiedFiles).forEach(modFile => {
-
-      if (modFile.dir) {
-
-        // map modified file location
-        let [fileUser, fileRepo, fileDir] = modFile.dir.split(',');
-
-        // if modified file dosen't have a branch
-        // and is in current repo
-        if (!fileRepo.includes(':')
-            && fileUser === user
-            && fileRepo === repoName) {
-
-          // append default branch to file
-          fileRepo = fileRepo + ':' + branch;
-          modFile.dir = [fileUser, fileRepo, fileDir].join();
-
-          modFilesChanged = true;
-
-        }
-
-      }
-
-    });
-
-    if (modFilesChanged) updateModFilesLS();
-    
 
     // get all eclipsed files in directory
     eclipsedFiles = Object.values(modifiedFiles).filter(modFile => modFile.dir == treeLoc.join());
@@ -463,8 +431,7 @@ async function renderSidebarHTML() {
 
       // scroll to end of title
       sidebarLogo.scrollTo({
-        left: sidebarLogo.scrollWidth - sidebarLogo.offsetLeft//,
-        //behavior: 'smooth'
+        left: sidebarLogo.scrollWidth - sidebarLogo.offsetLeft
       });
 
       sidebarLogo.classList.add('notransition');
@@ -832,6 +799,11 @@ async function renderSidebarHTML() {
     protectUnsavedCode();
 
   }
+  
+  
+  // hide branch menu
+  branchMenu.classList.remove('visible');
+  sidebarBranch.classList.remove('active');
 
 }
 
@@ -1341,10 +1313,104 @@ async function loadFileInHTML(fileEl, fileSha) {
       startLoading();
     }
 
+    
+    const fileDir = treeLoc.join();
+    
     // get file from git
     let resp = await git.getFile(treeLoc, fileName);
 
 
+    const currSelectedFileName = fileWrapper.querySelector('.selected .name').textContent.replaceAll('\n','');
+    
+    // if switched file or directory while loading, return
+    if (treeLoc.join() !== fileDir ||
+        currSelectedFileName !== fileName) {
+      
+      return;
+      
+    }
+    
+    
+    // if file dosen't exist
+    if (resp.message && resp.message === 'Not Found') {
+
+      // stop loading
+      stopLoading();
+      
+      showMessage('Hmm... that file dosen\'t exist.', 5000);
+      
+      
+      // remove file from HTML
+      if (fileEl) fileEl.remove();
+      
+      // if previous file selection exists
+      if (selectedFile.sha) {
+        
+        const prevSelFileEl = fileWrapper.querySelector('.item[sha="'+ selectedFile.sha +'"]');
+        
+        // if previous file selection exists in HTML
+        if (prevSelFileEl) {
+          
+          // load previous selected file
+          loadFileInHTML(prevSelFileEl, selectedFile.sha);
+          
+        } else {
+          
+          // clear editor to protect unsaved code
+          clearEditor();
+          
+        }
+        
+      } else {
+        
+        // clear editor to protect unsaved code
+        clearEditor();
+        
+      }
+      
+      function clearEditor() {
+
+        // clear codeit contents
+        cd.textContent = '\r\n';
+
+        // change codeit lang
+        cd.lang = '';
+
+        // clear codeit history
+        cd.history.records = [{ html: cd.innerHTML, pos: cd.getSelection() }];
+        cd.history.pos = 0;
+  
+        // update line numbers
+        updateLineNumbersHTML();
+
+        // if on mobile, show sidebar
+        if (isMobile) {
+
+          // don't transition
+          body.classList.add('notransition');
+
+          // show sidebar
+          toggleSidebar(true);
+          saveSidebarStateLS();
+
+          onNextFrame(() => {
+
+            body.classList.remove('notransition');
+
+          });
+
+        }
+
+        // change selected file to empty file
+        changeSelectedFile('', '', '', '', '', [0, 0], [0, 0], false);
+        
+      }
+
+      return;
+
+    }
+    
+    
     // if file is over 1MB
     if (resp.size >= 1000000 && resp.content === '') {
 
@@ -1612,7 +1678,7 @@ async function renderBranchMenuHTML(renderAll) {
   if (getAttr(branchMenu, 'tree') !== [user, repoName, contents].join()) {
 
     // show loading message
-    branchMenu.innerHTML = '<div class="icon selected"><a>Loading...</a></div>';
+    branchMenu.innerHTML = '<div class="icon" style="pointer-events: none; opacity: .5; font-weight: 500;"><a>Loading...</a></div>';
 
     setAttr(branchMenu, 'tree', [user, repoName, contents].join()); 
 
@@ -1723,7 +1789,7 @@ async function renderBranchMenuHTML(renderAll) {
   // render show more button
   if (!renderAll && branchResp.length > 1) {
 
-    out += '<div class="icon see-more">' + moreIcon + '<a>see more</a></div>';
+    out += '<div class="icon see-more">' + moreIcon + '<a>more</a></div>';
 
   }
 
@@ -2011,8 +2077,8 @@ sidebarBranch.addEventListener('click', () => {
       moveElToEl(branchMenu, sidebarBranch, 23);
 
     }
-
-    branchMenu.classList.add('top-margin');
+    
+    branchMenu.scrollTo(0, 0);
 
   }
 
@@ -2930,7 +2996,7 @@ function codeChange() {
 // protect unsaved code
 // if selected file is in current directory
 // but does not exist in the HTML
-function protectUnsavedCode() {
+async function protectUnsavedCode() {
 
   // map tree location
   const [user, repo, contents] = treeLoc;
@@ -2962,55 +3028,24 @@ function protectUnsavedCode() {
       // if new version of selected file exists
       if (selectedElName !== null) {
 
-        // load file
-        loadFileInHTML(selectedElName, getAttr(selectedElName, 'sha'));
-
-      } else {
-
-        // if the selected file was deleted,
-        // protect unsaved code by clearing codeit
-
-        // clear codeit contents
-        cd.textContent = '\r\n';
-
-        // change codeit lang
-        cd.lang = '';
+        const scrollPos = selectedFile.scrollPos;
 
-        // clear codeit history
-        cd.history.records = [{ html: cd.innerHTML, pos: cd.getSelection() }];
-        cd.history.pos = 0;
-  
-        // update line numbers
-        updateLineNumbersHTML();
-
-        // if on mobile, show sidebar
-        if (isMobile) {
-
-          // don't transition
-          body.classList.add('notransition');
-
-          // show sidebar
-          toggleSidebar(true);
-          saveSidebarStateLS();
-
-          onNextFrame(() => {
-
-            body.classList.remove('notransition');
-
-          });
-
-        }
+        // load file
+        await loadFileInHTML(selectedElName, getAttr(selectedElName, 'sha'));
 
-        // change selected file to empty file
-        changeSelectedFile('', '', '', '', '', [0, 0], [0, 0], false);
+        // prevent bottom float disappearing on mobile
+        if (isMobile) lastScrollTop = scrollPos[1];
+    
+        // scroll to pos in code
+        cd.scrollTo(scrollPos[0], scrollPos[1]);
 
       }
 
     } else {
 
       // if selected file isn't loaded
       if (selectedFile.sha !== getAttr(selectedElSha, 'sha')) {
-        
+
         // load file
         loadFileInHTML(selectedElSha, getAttr(selectedElSha, 'sha'));
 

full.css

@@ -1751,6 +1751,26 @@ body.mobile .context-menu {
   display: none;
 }
 
+.live-view-menu {
+  left: 11px;
+  top: 41px;
+  z-index: 1001;
+  margin-top: 7px;
+  padding: 0;
+}
+
+body:not(.mobile) .live-view-menu {
+  display: none;
+}
+
+.live-view-menu:not(.visible) {
+  padding: 2px 2px 2px 0px;
+}
+
+.live-view-menu:not(.visible) .icon {
+  padding: 9.5px 13px;
+}
+
 
 .dialog-wrapper {
   position: fixed;

full.html

@@ -83,6 +83,7 @@
       </div>
     </div>
     <div class="live-buttons">
+      <!-- <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" class="live-button options"><path d="M0 0h24v24H0z" fill="none"></path><path d="M12 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0 2c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm0 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" fill="currentColor"></path></svg> -->
       <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" class="live-button share"><path d="M0 0h24v24H0z" fill="none"></path><path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z" fill="currentColor"></path><path xmlns="http://www.w3.org/2000/svg" d="M16 5l-1.42 1.42-1.59-1.59V16h-1.98V4.83L9.42 6.42 8 5l4-4 4 4zm4 5v11c0 1.1-.9 2-2 2H6c-1.11 0-2-.9-2-2V10c0-1.11.89-2 2-2h3v2H6v11h12V10h-3V8h3c1.1 0 2 .89 2 2z" fill="currentColor" class="ios"></path></svg>
       <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" class="live-button close"><path d="M0 0h24v24H0z" fill="none"></path><path d="M8.7 15.9L4.8 12l3.9-3.9c.39-.39.39-1.01 0-1.4-.39-.39-1.01-.39-1.4 0l-4.59 4.59c-.39.39-.39 1.02 0 1.41l4.59 4.6c.39.39 1.01.39 1.4 0 .39-.39.39-1.01 0-1.4zm6.6 0l3.9-3.9-3.9-3.9c-.39-.39-.39-1.01 0-1.4.39-.39 1.01-.39 1.4 0l4.59 4.59c.39.39.39 1.02 0 1.41l-4.59 4.6c-.39.39-1.01.39-1.4 0-.39-.39-.39-1.01 0-1.4z" fill="currentColor"></path></svg>
     </div>
@@ -223,7 +224,7 @@
     </div>
   </div>
 
-  <div class="menu branch-menu"></div>
+  <div class="menu branch-menu top-margin"></div>
 
   <div class="menu context-menu">
     <div class="icon push">
@@ -280,6 +281,23 @@
     </div>
   </div>
 
+  <div class="menu live-view-menu">
+    <div class="icon console">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" class="branch-icon">
+        <path d="M0 0h24v24H0V0z" fill="none"></path>
+        <path d="M20,4H4C2.89,4,2,4.9,2,6v12c0,1.1,0.89,2,2,2h16c1.1,0,2-0.9,2-2V6C22,4.9,21.11,4,20,4z M20,18H4V8h16V18z M12,16 c0-0.55,0.45-1,1-1h4c0.55,0,1,0.45,1,1c0,0.55-0.45,1-1,1h-4C12.45,17,12,16.55,12,16z M6.79,9.71c0.39-0.39,1.02-0.39,1.41,0 l2.59,2.59c0.39,0.39,0.39,1.02,0,1.41l-2.59,2.59c-0.39,0.39-1.02,0.39-1.41,0c-0.39-0.39-0.39-1.02,0-1.41L8.67,13l-1.88-1.88 C6.4,10.73,6.4,10.1,6.79,9.71z" fill="currentColor"></path>
+      </svg>
+      <a>Console</a>
+    </div>
+    <div class="icon share">
+      <svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 0 24 24" width="24" class="branch-icon">
+        <path d="M0 0h24v24H0V0z" fill="none"></path>
+        <path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92s2.92-1.31 2.92-2.92-1.31-2.92-2.92-2.92z" fill="currentColor"></path>
+      </svg>
+      <a>Share</a>
+    </div>
+  </div>
+  
   <div class="dialog-wrapper">
     <div class="dialog-anim-wrapper">
       <div class="dialog">

git/gitauth.js

@@ -79,8 +79,8 @@ window.addEventListener('load', async () => {
   window.addEventListener('message', async (event) => {
 
     // if received a git code
-    if (event.origin === window.location.origin
-        && event.data.startsWith('gitCode=')) {
+    if (event.origin === window.location.origin &&
+        event.data && event.data.startsWith('gitCode=')) {
 
       // hide intro screen
       sidebar.classList.remove('intro');

live-view/live-view.js

@@ -1196,12 +1196,17 @@ async function renderLiveViewMarkdown(file) {
 
       await loadScript(window.location.origin + '/lib/prism.js', frameDoc.body);
 
+      
       let s = document.createElement('script');
+      
       s.appendChild(document.createTextNode(`Prism.plugins.autoloader.languages_path = 'https://cdnjs.cloudflare.com/ajax/libs/prism/1.28.0/components/'`));
+      
+      frameDoc.body.appendChild(s);
+      
       onNextFrame(() => {
         frameDoc.body.removeChild(s);
       });
-      frameDoc.body.appendChild(s);
+      
 
       await loadScript(window.location.origin + '/lib/codeit.js', frameDoc.body);
 

utils.js

@@ -68,7 +68,7 @@ const body = document.body,
 
 
 // version
-const version = '3.4.1';
+const version = '3.4.2';
 versionEl.innerText = version;
 
 let logVersion = () => {

worker/client-channel.js

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