Skip to content
This repository was archived by the owner on Oct 22, 2021. It is now read-only.

Commit 775b799

Browse files
committed
🔀 Merge local & origin
2 parents 5ca7fa2 + 7c3f3ef commit 775b799

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ eDEX-UI is meant to be used on touchscreens, even if it works well on regular di
4040
#### What's the difference between this and the original DEX-UI?
4141
Seenaburns' DEX-UI was created _"as an experiment or an art piece, not distributable software"_. The goal of this project is to push Seena's vision forward by making such an interface usable in real-life scenarios.
4242
#### Will using this make me insanely badass?
43-
[Yes.](https://78.media.tumblr.com/35d4ef4447e0112f776b629bffd99188/tumblr_mk4gf8zvyC1s567uwo1_500.gif)
43+
Yes.
44+
45+
<img width="220" src="https://78.media.tumblr.com/35d4ef4447e0112f776b629bffd99188/tumblr_mk4gf8zvyC1s567uwo1_500.gif" />
4446

4547

4648
## Featured in...

src/classes/filesystem.class.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class FilesystemDisplay {
109109

110110
i++;
111111
if (i === content.length) {
112-
if (tcwd !== "/") {
112+
if (tcwd !== "/" && tcwd !== "\\") {
113113
this.cwd.push({
114114
name: "..",
115115
type: "up"

src/classes/sysinfo.class.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@ class Sysinfo {
33
if (!parentId) throw "Missing parameters";
44

55
this.si = require("systeminformation");
6-
6+
7+
// See #255
8+
let os;
9+
switch (require("os").platform()) {
10+
case "darwin":
11+
os = "macOS";
12+
break;
13+
case "win32":
14+
os = "win";
15+
break;
16+
default:
17+
os = require("os").platform();
18+
}
19+
720
// Create DOM
821
this.parent = document.getElementById(parentId);
922
this.parent.innerHTML += `<div id="mod_sysinfo">
@@ -17,7 +30,7 @@ class Sysinfo {
1730
</div>
1831
<div>
1932
<h1>TYPE</h1>
20-
<h2>${require("os").platform().toUpperCase()}</h2>
33+
<h2>${os}</h2>
2134
</div>
2235
<div>
2336
<h1>POWER</h1>
@@ -33,7 +46,7 @@ class Sysinfo {
3346
this.updateBattery();
3447
this.batteryUpdater = setInterval(() => {
3548
this.updateBattery();
36-
}, 60000);
49+
}, 3000);
3750
}
3851
updateDate() {
3952
let time = new Date();

0 commit comments

Comments
 (0)