Added file uploading

and fixed bugs

Author: benhatsor

api/_cors.js

@@ -3,9 +3,21 @@ export default async function handler(request, response) {
 
   const https = require('https');
 
-  console.log(request);
 
-  const {status, data} = await getRequest(decodeURIComponent(request.query.url));
+  let query = Object.entries(request.query);
+  
+  query.shift();
+  
+  let url = request.query.url;
+    
+  query.forEach(entry => {
+    
+    url += '&' + entry[0] + '=' + entry[1];
+    
+  });
+  
+  
+  const {status, data} = await getRequest(url);
 
   response.status(status).send(data);
 

codedrop.js

@@ -107,9 +107,20 @@ function processFile(file) {
   const reader = new FileReader();
 
   reader.addEventListener('load', (event) => {
-
-    cd.textContent = event.target.result;
+    
+    if (hashCode(event.target.result) !== hashCode(cd.textContent)) {
+      
+      cd.textContent = event.target.result;
+      
+    }
+    
     cd.lang = getFileLang(file.name);
+    
+    cd.scrollTo(0, 0);
+    
+    // set caret pos in codeit
+    if (!isMobile) cd.setSelection(0, 0);
+    
     cd.focus();
 
     // change tab character
@@ -123,22 +134,26 @@ function processFile(file) {
 
     }
 
-    cd.history = [];
+    cd.history = [{ html: cd.innerHTML, pos: cd.getSelection() }];
 
-    saveSelectedFileContent();
-    saveSelectedFileCaretPos();
-    saveSelectedFileScrollPos();
-    saveSelectedFileLang();
+    window.addEventListener('load', () => {
+      
+      saveSelectedFileContent();
+      saveSelectedFileCaretPos();
+      saveSelectedFileScrollPos();
+      saveSelectedFileLang();
+      
+    });
 
-    console.log('Loaded local file. Name: ' + file.name + ' Size: ' + file.size + ' bytes');
+    showMessage('Loaded ' + file.name + '!', 5000);
 
   });
 
   reader.readAsText(file);
 
 }
 
-cd.on('drop', (ev) => {
+body.addEventListener('drop', (ev) => {
 
   // prevent default behavior (prevent file from being opened)
   ev.preventDefault();
@@ -147,7 +162,7 @@ cd.on('drop', (ev) => {
   if (gitToken == '') {
 
     // remove drop indication
-    document.body.classList.remove('focus');
+    cd.classList.remove('focus');
 
     if (ev.dataTransfer.items) {
 
@@ -179,7 +194,7 @@ cd.on('drop', (ev) => {
 
 })
 
-cd.on('dragover', (ev) => {
+body.addEventListener('dragover', (ev) => {
 
   // prevent default behavior (prevent file from being opened)
   ev.preventDefault();
@@ -188,47 +203,50 @@ cd.on('dragover', (ev) => {
   if (gitToken == '') {
 
     // show drop indication
-    document.body.classList.add('focus');
+    cd.classList.add('focus');
 
   }
 
 })
 
-cd.on('dragleave', (ev) => {
+body.addEventListener('dragleave', (ev) => {
 
   // if not logged into git
   if (gitToken == '') {
 
     // remove drop indication
-    document.body.classList.remove('focus');
+    cd.classList.remove('focus');
 
   }
 
 })
 
 if ('launchQueue' in window) {
 
-  launchQueue.setConsumer(async (launchParams) => {
-
-    // if not logged into git
-    if (gitToken == '') {
-
-      // nothing to do when the queue is empty
-      if (!launchParams.files.length) {
-        return;
-      }
-
-      for (const fileHandle of launchParams.files) {
-
-        // handle the file
-        const fileData = await fileHandle.getFile();
-
-        processFile(fileData);
-
-      }
-
+  window.launchQueue.setConsumer(async (launchParams) => {
+    
+    console.log('Launched with: ', launchParams);
+    
+    if (!launchParams.files.length) {
+      return;
     }
+    
+    const launchFile = launchParams.files[0];
+    
+    
+    // if logged into git
+    if (gitToken) {
+      
+      return;
+      
+    }
+    
+    
+    // handle the file
+    const fileData = await launchFile.getFile();
 
+    processFile(fileData);
+        
   });
 
 }

filebrowser.js

@@ -698,15 +698,15 @@ async function renderSidebarHTML() {
 
             }
 
-            out = `
+            out += `
             <div class="item repo" ` + ('fullName="' + modRepoName + '"') + `>
               <div class="label">
                 `+ repoIcon +`
                 <a class="name">`+ fullName +`</a>
               </div>
               `+ arrowIcon +`
             </div>
-            ` + out;
+            `;
 
           }
 
@@ -1177,7 +1177,7 @@ async function loadFileInHTML(fileEl, fileSha) {
   cd.scrollTo(selectedFile.scrollPos[0], selectedFile.scrollPos[1]);
 
   // clear codeit history
-  cd.history = [];
+  cd.history = [{ html: cd.innerHTML, pos: cd.getSelection() }];
 
   // update line numbers
   updateLineNumbersHTML();
@@ -2040,7 +2040,7 @@ function createNewFileInHTML() {
         cd.lang = getFileLang(fileName);
 
         // clear codeit history
-        cd.history = [];
+        cd.history = [{ html: cd.innerHTML, pos: cd.getSelection() }];
 
         // update line numbers
         updateLineNumbersHTML();
@@ -2433,13 +2433,13 @@ function protectUnsavedCode() {
         // protect unsaved code by clearing codeit
 
         // clear codeit contents
-        cd.textContent = '';
+        cd.textContent = '\r\n';
 
         // change codeit lang
         cd.lang = '';
 
         // clear codeit history
-        cd.history = [];
+        cd.history = [{ html: cd.innerHTML, pos: cd.getSelection() }];
 
         // update line numbers
         updateLineNumbersHTML();

manifest.js

@@ -21,21 +21,22 @@ let manifest = {
   ],
   "file_handlers": [
     {
-      "action": window.location.origin + "/full",
+      "action": window.location.origin + "/full?upload=true",
+      "name": "code",
       "accept": {
-        "text/css": [".css"]
+        "text/plain": ["text/*", "application/json"]
       }
     }
   ],
   "share_target": {
-    "action": window.location.origin + "/full",
+    "action": window.location.origin + "/full?upload=true",
     "method": "POST",
     "enctype": "multipart/form-data",
     "params": {
       "files": [
         {
-          "name": "file",
-          "accept": ["text/css", "application/json", ".css"]
+          "name": "code",
+          "accept": ["text/*", "application/json"]
         }
       ]
     }
@@ -44,19 +45,7 @@ let manifest = {
   "launch_handler": {
     "route_to": "new-client"
   },
-  "capture_links": "new-client",
-  "screenshots": [
-    {
-      "src": window.location.origin + "/homepage/featured-pic.png",
-      "type": "image/png",
-      "sizes": "750x1590"
-    },
-    {
-      "src": window.location.origin + "/homepage/secondary-pic.png",
-      "type": "image/png",
-      "sizes": "750x1590"
-    }
-  ]
+  "capture_links": "new-client"
 };
 
 

utils.js

@@ -68,7 +68,7 @@ const body = document.body,
 
 
 // version
-const version = '3.0.1';
+const version = '3.0.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-v531';
+const WORKER_NAME = 'codeit-worker-v532';
 
 
 // internal paths