Skip to content

Commit c244adc

Browse files
committed
fix: client: dom: toggleSelectedFile: return DOM
1 parent 3008794 commit c244adc

9 files changed

Lines changed: 13 additions & 23 deletions

File tree

‎.madrun.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default {
2929
'fix:lint': async () => `putout --fix . && redlint fix`,
3030
'lint:stream': () => run('lint', '-f stream'),
3131
'test': () => [testEnv, `tape '{test}/**/*.js' '{bin,client,static,common,server}/**/*.spec.js' -f fail`],
32-
'test:e2e': () => `tape 'test-e2e/ratelimit.js'`,
32+
'test:e2e': () => `tape 'test-e2e/server/**/*.js'`,
3333
'test:e2e:client': () => 'playwright test',
3434
'test:client': () => `tape 'test/client/**/*.js'`,
3535
'test:server': () => `tape 'test/**/*.js' 'server/**/*.spec.js' 'common/**/*.spec.js'`,

‎client/dom/cmd.js‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
/* global DOM */
22
const SELECTED_FILE = 'selected-file';
3-
const Cmd = {
4-
getSelectedFiles,
5-
isSelected,
6-
unselectFile,
7-
selectFile,
8-
selectAllFiles,
9-
toggleSelectedFile,
10-
toggleAllSelectedFiles,
11-
};
123

134
/**
145
* selected file check
@@ -31,43 +22,43 @@ export function selectFile(currentFile) {
3122

3223
current.classList.add(SELECTED_FILE);
3324

34-
return Cmd;
25+
return DOM;
3526
}
3627

3728
export function unselectFile(currentFile) {
3829
const current = currentFile || DOM.getCurrentFile();
3930

4031
current.classList.remove(SELECTED_FILE);
4132

42-
return Cmd;
33+
return DOM;
4334
}
4435

4536
export function toggleSelectedFile(currentFile) {
4637
const current = currentFile || DOM.getCurrentFile();
4738
const name = DOM.getCurrentName(current);
4839

4940
if (name === '..')
50-
return Cmd;
41+
return DOM;
5142

5243
current.classList.toggle(SELECTED_FILE);
5344

54-
return Cmd;
45+
return DOM;
5546
}
5647

5748
export function toggleAllSelectedFiles() {
5849
DOM
5950
.getAllFiles()
6051
.map(DOM.toggleSelectedFile);
6152

62-
return Cmd;
53+
return DOM;
6354
}
6455

6556
export function selectAllFiles() {
6657
DOM
6758
.getAllFiles()
6859
.map(DOM.selectFile);
6960

70-
return Cmd;
61+
return DOM;
7162
}
7263

7364
/**

‎client/key/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,13 @@ export async function _switchKey(event) {
161161
break;
162162

163163
case KEY.INSERT:
164-
DOM.toggleSelectedFile(current);
165-
DOM.setCurrentFile(next);
164+
DOM.toggleSelectedFile(current)
165+
.setCurrentFile(next);
166166
break;
167167

168168
case KEY.INSERT_MAC:
169-
DOM.toggleSelectedFile(current);
170-
DOM.setCurrentFile(next);
169+
DOM.toggleSelectedFile(current)
170+
.setCurrentFile(next);
171171
break;
172172

173173
case KEY.DELETE:

‎playwright.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import {defineConfig} from '@playwright/test';
22

33
export default defineConfig({
44
testDir: './test-e2e',
5-
testMatch: '**/*.spec.js',
5+
testMatch: 'client/**/*.js',
66
timeout: 30_000,
77
use: {
88
baseURL: 'http://localhost:3002',
99
headless: true,
1010
},
1111
webServer: {
12-
command: 'node bin/cloudcmd.js --no-auth --port 3002 --root test-e2e/fixture --no-open',
12+
command: 'node bin/cloudcmd.js --no-auth --port 3002 --root test-e2e/client/fixture --no-open',
1313
url: 'http://localhost:3002',
1414
reuseExistingServer: false,
1515
timeout: 15_000,
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ test('Insert selects the current file', async ({page}) => {
88
const rows = getRows(page);
99
const first = rows.nth(1);
1010

11-
// nth(0) is '..'
1211
await first.click();
1312
await page.keyboard.press('Insert');
1413

0 commit comments

Comments
 (0)