Merge pull request #111 from codeitcodes/dev

Dev

Author: benhatsor

filebrowser.js

@@ -76,6 +76,10 @@ async function renderSidebarHTML() {
 
       // show repo name in sidebar
       sidebarLogo.innerText = repoName;
+      
+      // scroll to start of repo name
+      sidebarLogo.scrollTo(0, 0);
+      scrolledSidebarTitle();
 
       // change header options
       header.classList.remove('out-of-repo');
@@ -163,9 +167,16 @@ async function renderSidebarHTML() {
     treeLoc[1] = '';
     treeLoc[2] = '';
     saveTreeLocLS(treeLoc);
-
+    
+    // change sidebar title
+    sidebarLogo.innerText = 'Repositories';
+    
+    // scroll to start of repo name
+    sidebarLogo.scrollTo(0, 0);
+    scrolledSidebarTitle();
+    
     renderSidebarHTML();
-
+    
     return;
 
   }
@@ -195,6 +206,10 @@ async function renderSidebarHTML() {
 
     // show repo name in sidebar
     sidebarLogo.innerText = repoName;
+    
+    // scroll to start of repo name
+    sidebarLogo.scrollTo(0, 0);
+    scrolledSidebarTitle();
 
     // change header options
     header.classList.remove('out-of-repo');
@@ -316,8 +331,12 @@ async function renderSidebarHTML() {
 
       }
 
-      // animate title
-      if (sidebarLogo.scrollLeft > 0) titleAnimation = 'smooth';
+
+      // scroll to end of title
+      sidebarLogo.scrollTo({
+        left: sidebarLogo.scrollWidth - sidebarLogo.offsetLeft,
+        behavior: 'smooth'
+      });
 
     } else if (repo != '') {
 
@@ -333,31 +352,34 @@ async function renderSidebarHTML() {
         sidebarLogo.innerText = user + '/' + repoName;
 
       }
+      
+      // scroll to start of repo name
+      sidebarLogo.scrollTo(0, 0);
+      sidebarLogo.classList.add('notransition');
+      
+      window.setTimeout(() => {
+        sidebarLogo.classList.remove('notransition');
+      }, 180);
+      
+      scrolledSidebarTitle();
 
     } else {
 
       // show title
       sidebarLogo.innerText = 'Repositories';
-
-    }
-
-    // scroll to end of title
-
-    if (!titleAnimation) {
-
+      
+      // scroll to start of repo name
+      sidebarLogo.scrollTo(0, 0);
       sidebarLogo.classList.add('notransition');
-
+      
       window.setTimeout(() => {
         sidebarLogo.classList.remove('notransition');
       }, 180);
+      
+      scrolledSidebarTitle();
 
     }
 
-    sidebarTitle.children[1].scrollTo({
-      left: sidebarLogo.scrollWidth - sidebarLogo.offsetLeft,
-      behavior: titleAnimation
-    });
-
 
     // if navigating in repository
     if (repo != '') {
@@ -693,6 +715,10 @@ function addHTMLItemListeners() {
 
           // show repo name in sidebar
           sidebarLogo.innerText = repoLoc[1];
+          
+          // scroll to start of repo name
+          sidebarLogo.scrollTo(0, 0);
+          scrolledSidebarTitle();
 
           // change header options
           header.classList.remove('out-of-repo');
@@ -1413,8 +1439,10 @@ sidebarTitle.addEventListener('click', (e) => {
 // show gradients on edges of sidebar title
 // when scrolling long titles
 
-sidebarLogo.addEventListener('scroll', () => {
+sidebarLogo.addEventListener('scroll', scrolledSidebarTitle);
 
+function scrolledSidebarTitle() {
+  
   if (sidebarLogo.scrollLeft > 0) {
 
     sidebarLogo.classList.add('scrolled-start');
@@ -1435,8 +1463,8 @@ sidebarLogo.addEventListener('scroll', () => {
     sidebarLogo.classList.remove('scrolled-end');
 
   }
-
-})
+  
+}
 
 
 // if clicked on branch icon,

files.js

@@ -120,30 +120,34 @@ function onFileEclipsedInCache(oldSha, newSha, newFile) {
     // find the eclipsed file
     fileToUpdate = modifiedFiles[oldSha];
 
-    // update old file to new sha
-    fileToUpdate.sha = newSha;
-    
-    // update old file caret pos
-    fileToUpdate.caretPos = [0, 0];
-    
-    // set old file to eclipsed mode
-    fileToUpdate.eclipsed = true;
-
-    // if file to update is selected
-    if (selectedFile.sha === oldSha) {
-
-      // update its content
-      // to the selected file contents
-      fileToUpdate.content = selectedFile.content;
-
-      // update selected file to new sha
-      selectedFile.sha = newSha;
+    if (fileToUpdate) {
+      
+      // update old file to new sha
+      fileToUpdate.sha = newSha;
+      
+      // update old file caret pos
+      fileToUpdate.caretPos = [0, 0];
+      
+      // set old file to eclipsed mode
+      fileToUpdate.eclipsed = true;
+  
+      // if file to update is selected
+      if (selectedFile.sha === oldSha) {
+  
+        // update its content
+        // to the selected file contents
+        fileToUpdate.content = selectedFile.content;
+  
+        // update selected file to new sha
+        selectedFile.sha = newSha;
+        
+        // set selected file to eclipsed mode
+        selectedFile.eclipsed = true;
+  
+        updateSelectedFileLS();
+        
+      }
 
-      // set selected file to eclipsed mode
-      selectedFile.eclipsed = true;
-
-      updateSelectedFileLS();
-
     }
 
   } else {
@@ -153,8 +157,12 @@ function onFileEclipsedInCache(oldSha, newSha, newFile) {
   }
 
 
-  // store the updated file under new sha as key
-  modifiedFiles[newSha] = fileToUpdate;
+  if (fileToUpdate) {
+    
+    // store the updated file under new sha as key
+    modifiedFiles[newSha] = fileToUpdate;
+    
+  }
 
 
   // update modified files in local storage

full.css

@@ -825,7 +825,6 @@ body.notransition .sidebar {
   padding: 12px 0;
   padding-left: 18px;
   margin-left: -18px;
-  flex: 1;
 }
 
 .sidebar .header .title-screen .title:hover {
@@ -852,7 +851,7 @@ body.notransition .sidebar {
 .sidebar .header .logo::after {
   content: '';
   position: absolute;
-  right: 44px;
+  right: 0;
   width: 28px;
   height: 20px;
   background: linear-gradient(270deg, #1a1c24, #1a1c2400);
@@ -888,6 +887,8 @@ body.notransition .sidebar {
 .sidebar .header .title .branch-icon {
   padding: 5px;
   opacity: .5;
+  position: absolute;
+  right: -26px;
   color: #828689;
   display: none;
   z-index: 1;

index.html

@@ -241,3 +241,4 @@ <h2 class="color-1 weight-title-h font-title section__title center">A codeful of
 </body>
 
 </html>
+