diff options
| -rw-r--r-- | readme.md | 4 | ||||
| -rw-r--r-- | src/common.js | 5 | ||||
| -rw-r--r-- | src/img/cards.png | bin | 0 -> 501 bytes | |||
| -rw-r--r-- | src/img/doc.png | bin | 0 -> 451 bytes | |||
| -rw-r--r-- | src/jssh.js | 26 | ||||
| -rw-r--r-- | src/window-utils.js | 24 |
6 files changed, 33 insertions, 26 deletions
@@ -5,6 +5,8 @@ icons (src/img/\*): [here](https://win98icons.alexmeub.com/)</br> todo: -solitaire! +solitaire!</br> +fix some of the image scaling</br> + <img alt='./badges/000010.gif' src='./badges/000010.gif'><img alt='./badges/catp0rtal.gif' src='./badges/catp0rtal.gif'><img alt='./badges/getbsod.gif' src='./badges/getbsod.gif'><img alt='./badges/reshirii.gif' src='./badges/reshirii.gif'><img alt='./badges/104.gif' src='./badges/104.gif'><img alt='./badges/css2.gif' src='./badges/css2.gif'><img alt='./badges/gitea.gif' src='./badges/gitea.gif'><img alt='./badges/rosemary22.gif' src='./badges/rosemary22.gif'><img alt='./badges/1of2.gif' src='./badges/1of2.gif'><img alt='./badges/css.png' src='./badges/css.png'><img alt='./badges/hexrain.png' src='./badges/hexrain.png'><img alt='./badges/rosemary7.gif' src='./badges/rosemary7.gif'><img alt='./badges/amatsuki.gif' src='./badges/amatsuki.gif'><img alt='./badges/devils_button.gif' src='./badges/devils_button.gif'><img alt='./badges/linuxnow2.gif' src='./badges/linuxnow2.gif'><img alt='./badges/thatwhitehand.png' src='./badges/thatwhitehand.png'><img alt='./badges/anibanner.gif' src='./badges/anibanner.gif'><img alt='./badges/devils.gif' src='./badges/devils.gif'><img alt='./badges/neovim.gif' src='./badges/neovim.gif'><img alt='./badges/transistor_cafe.gif' src='./badges/transistor_cafe.gif'><img alt='./badges/anticodeandrun.gif' src='./badges/anticodeandrun.gif'><img alt='./badges/digby88.gif' src='./badges/digby88.gif'><img alt='./badges/newlambda.gif' src='./badges/newlambda.gif'><img alt='./badges/transnow2.gif' src='./badges/transnow2.gif'><img alt='./badges/arizona.gif' src='./badges/arizona.gif'><img alt='./badges/dramaturgie.gif' src='./badges/dramaturgie.gif'><img alt='./badges/nvidia.gif' src='./badges/nvidia.gif'><img alt='./badges/zettai.gif' src='./badges/zettai.gif'><img alt='./badges/asexuals_now.gif' src='./badges/asexuals_now.gif'><img alt='./badges/finger-logo-people.gif' src='./badges/finger-logo-people.gif'><img alt='./badges/nya2.gif' src='./badges/nya2.gif'><img alt='./badges/beyes.gif' src='./badges/beyes.gif'><img alt='./badges/firefox4.gif' src='./badges/firefox4.gif'><img alt='./badges/photo.jpeg' src='./badges/photo.jpeg'><img alt='./badges/calcium.png' src='./badges/calcium.png'><img alt='./badges/friday-girl.gif' src='./badges/friday-girl.gif'><img alt='./badges/photo.png' src='./badges/photo.png'>
\ No newline at end of file diff --git a/src/common.js b/src/common.js index a3309d9..f7d2cca 100644 --- a/src/common.js +++ b/src/common.js @@ -8,4 +8,7 @@ function appendHtml(el, str) { while (div.children.length > 0) { el.appendChild(div.children[0]); } -}
\ No newline at end of file +} + + +const rem_emp = function (e) {return e !== "";};
\ No newline at end of file diff --git a/src/img/cards.png b/src/img/cards.png Binary files differnew file mode 100644 index 0000000..b8fbe87 --- /dev/null +++ b/src/img/cards.png diff --git a/src/img/doc.png b/src/img/doc.png Binary files differnew file mode 100644 index 0000000..02767af --- /dev/null +++ b/src/img/doc.png diff --git a/src/jssh.js b/src/jssh.js index 646c571..f9af00e 100644 --- a/src/jssh.js +++ b/src/jssh.js @@ -84,14 +84,20 @@ class jssh { } add_file(fs, path, dir) { //console.log(fs, path); - if (path.length == 1) + if (path.length == 1){ + for(let o of fs){ + if(o.name == path[0]){ + path[0] += '-1' + return this.add_file(fs,path,dir) + } + } return fs.push({ name: path[0], perms: { r: true }, dir: dir, content: dir ? [] : "", }); - + } for (let f in fs) { if (fs[f].name == path[0] && fs[f].dir) { fs = fs[f].content; @@ -254,9 +260,7 @@ class jssh { : this.working_dir + "/" + stripped[1] ) .split("/") - .filter(function (e) { - return e !== ""; - }), + .filter(rem_emp), false ); @@ -270,9 +274,7 @@ class jssh { : this.working_dir + "/" + stripped[1] ) .split("/") - .filter(function (e) { - return e !== ""; - }) + .filter(rem_emp) ); break; case "mkdir": @@ -284,9 +286,7 @@ class jssh { : this.working_dir + "/" + stripped[1] ) .split("/") - .filter(function (e) { - return e !== ""; - }), + .filter(rem_emp), true ); break; @@ -469,9 +469,7 @@ class jssh { .trim(); pp = this.clean_path(pp[0] == "/" ? pp : this.working_dir + "/" + pp); - pp = pp.split("/").filter(function (e) { - return e !== ""; - }); + pp = pp.split("/").filter(rem_emp); this.write_file(this.fs, pp, history_write.trim(), redir_app); } else { document.getElementById(this.history).innerHTML += history_write; diff --git a/src/window-utils.js b/src/window-utils.js index 2fdf1bb..40b5c62 100644 --- a/src/window-utils.js +++ b/src/window-utils.js @@ -174,9 +174,7 @@ let util = { files += "<div id='"+i+"-fs-cont-root' style='width:100%;height:100%;display:inline-flex;flex-direction:row;flex-wrap:wrap'>" //left bar //console.log(inp.path) - let ppp = inp.path.split("/").filter(function (e) { - return e !== ""; - }) + let ppp = inp.path.split("/").filter(rem_emp) function rec_bar_fun(cdir,target_full,target_ind,padding,patt){ @@ -237,7 +235,7 @@ let util = { i + "-id-name-" + f.name + - "'style='height:55px;position:relative;width:48px;display:inline-block;padding:10px;'><img style='height:48px;width:48px;' src='src/img/notepad.png'><div style='position:absolute;bottom:0;overflow-wrap: break-word; width:inherit;user-select:none;'>" + + "'style='height:55px;position:relative;width:48px;display:inline-block;padding:10px;'><img style='height:42px;width:42px;' src='src/img/doc.png'><div style='position:absolute;bottom:0;overflow-wrap: break-word; width:inherit;user-select:none;'>" + f.name + "</div></div>"; fil.push(f) @@ -286,10 +284,11 @@ let util = { let ele = document.getElementById(i+"-fs-inner-cont") let ele_root = document.getElementById(i+"-content-content") + console.log(inp.path.split("/").filter(rem_emp)) util.scrollbar(i,'root-bar',ele_root.parentElement,ele) util.context_menu(ele,{menu:[ - {name:'new file',callback:()=>{console.log("copy")}}, - {name:'new directory',callback:()=>{ll.add_file(ll.fs,['untitled'],true);load()}}, + {name:'new file',callback:()=>{ll.add_file(ll.fs,[...inp.path.split("/").filter(rem_emp),'untitled'],false);load()}}, + {name:'new directory',callback:()=>{ll.add_file(ll.fs,[...inp.path.split("/").filter(rem_emp),'untitled'],true);load()}}, ]}) //document.getElementById(i+"-fs-inner-cont").oncontextmenu = (ev) => { // return false @@ -363,8 +362,8 @@ let util = { dou = false; } else { dou = true; - - tt.style.backgroundColor = "blue"; + tt.style.boxShadow = "0 0 0 1px rgba(0,0,244,0.4) inset" + tt.style.backgroundColor = "rgba(0,0,244,0.2)"; setTimeout(() => { if (dou) { if (ev.ctrlKey) { @@ -373,9 +372,11 @@ let util = { } else sel.push(f.name); } else if (ev.shiftKey) { let tem = false + let osel = sel + sel = [] for (let ff of fil) { //console.log(ff.name,sel[0]) - if(ff==f||ff.name==sel[0]){ + if(ff==f||ff.name==osel[0]){ //console.log("uwu") if(tem){ sel.push(ff.name) @@ -397,8 +398,11 @@ let util = { i + "-id-name-" + aa.name ); if (sel.includes(aa.name)) { - ttt.style.backgroundColor = "blue"; + ttt.style.backgroundColor = "rgba(0,0,244,0.2)"; + ttt.style.boxShadow = "0 0 0 1px rgba(0,0,244,0.4) inset" + } else { + ttt.style.boxShadow = "" ttt.style.backgroundColor = ""; } } |
