Skip to content

Commit 9f5a131

Browse files
committed
cleanup
1 parent 3810a29 commit 9f5a131

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

resources/js/electron-plugin/dist/server/api/screen.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ router.get('/primary-display', (req, res) => {
1414
router.get('/cursor-position', (req, res) => {
1515
res.json(screen.getCursorScreenPoint());
1616
});
17+
router.get('/active', (req, res) => {
18+
const cursor = screen.getCursorScreenPoint();
19+
res.json(screen.getDisplayNearestPoint(cursor));
20+
});
1721
export default router;

resources/js/electron-plugin/dist/server/php.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function getArgumentEnv() {
8282
return env;
8383
}
8484
function getAppPath() {
85-
let appPath = join(__dirname, '../../resources/app/').replace('app.asar', 'app.asar.unpacked');
85+
let appPath = join(__dirname, '../../../../../resources/app/').replace('app.asar', 'app.asar.unpacked');
8686
if (process.env.NODE_ENV === 'development' || argumentEnv.TESTING == 1) {
8787
appPath = process.env.APP_PATH || argumentEnv.APP_PATH;
8888
}
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import express from 'express'
2-
import {app, Menu} from 'electron'
3-
import {mapMenu} from "./helper";
1+
import express from 'express';
2+
43
const router = express.Router();
54

65
router.get('/', (req, res) => {
@@ -10,6 +9,6 @@ router.get('/', (req, res) => {
109
arch: process.arch,
1110
uptime: process.uptime()
1211
})
13-
})
12+
});
1413

1514
export default router;

0 commit comments

Comments
 (0)