Merge branch 'master' into sidebar

json/ctx.json

@@ -10,5 +10,10 @@
         {"name": "Reload", "id": "ctx-reload", "onclick": "reload"},
         {"name": "Refresh", "id": "ctx-refresh", "onclick": "refresh"},
         {"name": "Options", "id": "ctx-options", "onclick": "options"}
+    ],
+    [
+        {"name": "Rename", "id": "ctx-rename-folder", "onclick": "rename-folder"},
+        {"name": "Pin to Favorites", "id": "ctx-pin", "onclick": "pin"},
+        {"name": "Delete", "id": "ctx-delete-folder", "onclick": "delete-folder"}
     ]
 ]

scripts/contextmenu/createcontext.js

@@ -3,6 +3,16 @@ module.exports = (e, target, window) => {
     window.kade.context = true;
     let ctx = document.getElementById('ctx');
     ctx.style.display = 'block';
+    const ctxf = document.getElementById('ctx-folder');
+    if (target.classList.contains('file') || (target.parentElement && target.parentElement.classList.contains('file'))) {
+        ctxf.style.display = 'block';
+        ctxf.previousElementSibling.style.display = 'block';
+        if (target.classList.contains('file')) {window.kade.currentFolder = target.children[1].innerHTML;}
+        else {window.kade.currentFolder = target.parentElement.children[1].innerHTML;}
+    } else {
+        ctxf.style.display = 'none';
+        ctxf.previousElementSibling.style.display = 'none';
+    }
     ctx.style.left = `${Math.min(e.pageX, (window.innerWidth - (ctx.clientWidth + 2)))}px`;
     ctx.style.top = `${Math.min(e.pageY, ((window.innerHeight + window.scrollY) - (ctx.clientHeight + 2)))}px`;
 };

scripts/contextmenu/rename-folder.js

@@ -0,0 +1,94 @@
+const fs = require('fs');
+const path = require('path');
+const Mousetrap = require('../dep/mousetrap');
+
+const lightRefresh = require('../fileview/lightrefresh');
+const preModal = require('../modal/pre');
+const postModal = require('../modal/post');
+const showError = require('../modal/common/error');
+const clearModals = require('../modal/clearmodals');
+const newToast = require('../toast/createtoast');
+const refresh = require('../fileview/refresh');
+
+module.exports = () => {
+    if (window.kade.modal) {return;}
+    preModal('rename-folder-modal-container');
+    let modalOut = document.createElement('div');
+    modalOut.className = 'modal';
+    modalOut.id = 'rename-folder-modal-container';
+    document.body.appendChild(modalOut);
+    let modal = document.createElement('div');
+    modal.className = 'modal-wrapper';
+    modalOut.appendChild(modal);
+    let title = document.createElement('h2');
+    title.innerHTML = 'Rename Folder';
+    modal.appendChild(title);
+    let text = document.createElement('p');
+    text.innerHTML = "What would you like to rename this folder to?";
+    modal.appendChild(text);
+    let cont = document.createElement('div');
+    cont.className = 'button-container';
+    modal.appendChild(cont);
+    let input = document.createElement('input');
+    input.placeholder = window.kade.currentFolder;
+    input.id = 'rename-folder-input';
+    input.value = window.kade.currentFolder;
+    let lastIn = '';
+    input.oninput = () => {
+        if (!input.value.match(/^[a-zA-Z0-9-_() ]*$/gm)) {input.value = lastIn;}
+        else {lastIn = input.value;}
+    };
+    cont.appendChild(input);
+    let conf = document.createElement('button');
+    conf.innerHTML = 'Rename';
+    conf.onclick = () => {
+        try {
+            input.value.trim();
+            if (!input.value.length) {return;}
+            if (fs.existsSync(path.join(window.kade.cpath, input.value))) {
+                if (!input.value.match(/^.+\(\d\)$/gm)) {input.value += ' (1)';}
+                else {
+                    let tempstr = input.value.split('');
+                    tempstr[input.value.length - 2] = `${Number(input.value.charAt(input.value.length - 2)) + 1}`;
+                    input.value = tempstr.join('');
+                }
+                return;
+            }
+            fs.renameSync(path.join(window.kade.cpath, window.kade.currentFolder), path.join(window.kade.cpath, input.value));
+            lightRefresh();
+            modalOut.remove();
+            newToast(
+                "Folder renamed", [`Folder "${window.kade.currentFolder}" was successfully renamed to "${input.value}"`, `<em>${window.kade.cpath}/${input.value}</em>`], undefined, false, 5,
+                () => {
+                    refresh(`${window.kade.cpath}/${input.value}`);
+                    require('electron').clipboard.writeText(`${window.kade.cpath}`);
+                    newToast("Copied!", "<em>The folder's path has been copied to your clipboard.</em>", "#19df46");
+                }
+            );
+        } catch {
+            newToast("Folder not Renamed", "An error caused that folder to not be renamed.", "#b24355", false, 5, () => {showError("Folder Creation", "There was an unknown error while trying to create that folder. It may be a permissions issue, or the host folder doesn't exist anymore.");});
+            clearModals();
+        }
+        postModal(modalOut.id);
+    };
+    cont.appendChild(conf);
+    input.focus();
+    let msm = new Mousetrap(modal);
+    msm.bind('esc', () => {
+        lightRefresh();
+        modalOut.remove();
+        postModal(modalOut.id);
+    });
+    msm.bind('enter', () => {conf.click();});
+    let close = document.createElement('a');
+    close.className = 'close-button';
+    close.onclick = () => {
+        lightRefresh();
+        modalOut.remove();
+        postModal(modalOut.id);
+    };
+    let closeWrap = document.createElement('div');
+    closeWrap.className = 'close-button-wrapper';
+    modal.appendChild(closeWrap);
+    closeWrap.appendChild(close);
+}

scripts/startup/changelog.js

@@ -60,9 +60,6 @@ module.exports = () => {
     });
 
     clww.style = `height: ${modalOut.clientHeight - 6};`; // TODO cry enough tears that they magically make this line work
-    console.log(clww.style.height);
-    console.log(modalOut.clientHeight - 6);
-    console.log(typeof clww.style);
 
     let msm = new Mousetrap(modal);
     msm.bind('esc', () => {

scripts/startup/initcontext.js

@@ -23,5 +23,6 @@ module.exports = () => {
             }
             if (i + 1 < ctxl.length) {ctx.appendChild(document.createElement('hr'));}
         }
+        document.getElementById('ctx-pin').parentElement.id = 'ctx-folder';
     } catch (e) {console.error(e);}
 };

styles/context.css

@@ -33,4 +33,9 @@
     align-items: stretch;
     align-content: stretch;
     row-gap: 2px;
+}
+
+#ctx-folder {
+    padding: 0 0;
+    margin: 0 0;
 }