aboutsummaryrefslogtreecommitdiff
path: root/src/content
diff options
context:
space:
mode:
Diffstat (limited to 'src/content')
-rw-r--r--src/content/InputDriver.ts36
-rw-r--r--src/content/client/FollowMasterClient.ts4
-rw-r--r--src/content/client/SettingClient.ts4
-rw-r--r--src/content/controllers/FollowKeyController.ts2
-rw-r--r--src/content/controllers/KeymapController.ts2
-rw-r--r--src/content/controllers/MarkKeyController.ts2
-rw-r--r--src/content/controllers/SettingController.ts6
-rw-r--r--src/content/domains/Key.ts72
-rw-r--r--src/content/domains/KeySequence.ts64
-rw-r--r--src/content/repositories/KeymapRepository.ts8
-rw-r--r--src/content/repositories/SettingRepository.ts2
-rw-r--r--src/content/usecases/FollowSlaveUseCase.ts2
-rw-r--r--src/content/usecases/KeymapUseCase.ts24
-rw-r--r--src/content/usecases/SettingUseCase.ts2
14 files changed, 58 insertions, 172 deletions
diff --git a/src/content/InputDriver.ts b/src/content/InputDriver.ts
index 0472088..bc184d2 100644
--- a/src/content/InputDriver.ts
+++ b/src/content/InputDriver.ts
@@ -1,5 +1,5 @@
import * as dom from '../shared/utils/dom';
-import Key, * as keys from './domains/Key';
+import Key from '../shared/settings/Key';
const cancelKey = (e: KeyboardEvent): boolean => {
if (e.key === 'Escape') {
@@ -11,6 +11,38 @@ const cancelKey = (e: KeyboardEvent): boolean => {
return false;
};
+const modifiedKeyName = (name: string): string => {
+ if (name === ' ') {
+ return 'Space';
+ }
+ if (name.length === 1) {
+ return name;
+ } else if (name === 'Escape') {
+ return 'Esc';
+ }
+ return name;
+};
+
+// visible for testing
+export const keyFromKeyboardEvent = (e: KeyboardEvent): Key => {
+ let key = modifiedKeyName(e.key);
+ let shift = e.shiftKey;
+ if (key.length === 1 && key.toUpperCase() === key.toLowerCase()) {
+ // make shift false for symbols to enable key bindings by symbold keys.
+ // But this limits key bindings by symbol keys with Shift
+ // (such as Shift+$>.
+ shift = false;
+ }
+
+ return new Key({
+ key: modifiedKeyName(e.key),
+ shift: shift,
+ ctrl: e.ctrlKey,
+ alt: e.altKey,
+ meta: e.metaKey,
+ });
+};
+
export default class InputDriver {
private pressed: {[key: string]: string} = {};
@@ -66,7 +98,7 @@ export default class InputDriver {
return;
}
- let key = keys.fromKeyboardEvent(e);
+ let key = keyFromKeyboardEvent(e);
for (let listener of this.onKeyListeners) {
let stop = listener(key);
if (stop) {
diff --git a/src/content/client/FollowMasterClient.ts b/src/content/client/FollowMasterClient.ts
index da75308..6681e8a 100644
--- a/src/content/client/FollowMasterClient.ts
+++ b/src/content/client/FollowMasterClient.ts
@@ -1,5 +1,5 @@
import * as messages from '../../shared/messages';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
export default interface FollowMasterClient {
startFollow(newTab: boolean, background: boolean): void;
@@ -35,7 +35,7 @@ export class FollowMasterClientImpl implements FollowMasterClient {
this.postMessage({
type: messages.FOLLOW_KEY_PRESS,
key: key.key,
- ctrlKey: key.ctrlKey || false,
+ ctrlKey: key.ctrl || false,
});
}
diff --git a/src/content/client/SettingClient.ts b/src/content/client/SettingClient.ts
index 0850f11..fc62720 100644
--- a/src/content/client/SettingClient.ts
+++ b/src/content/client/SettingClient.ts
@@ -1,4 +1,4 @@
-import Settings from '../../shared/Settings';
+import Settings from '../../shared/settings/Settings';
import * as messages from '../../shared/messages';
export default interface SettingClient {
@@ -10,6 +10,6 @@ export class SettingClientImpl {
let settings = await browser.runtime.sendMessage({
type: messages.SETTINGS_QUERY,
});
- return settings as Settings;
+ return Settings.fromJSON(settings);
}
}
diff --git a/src/content/controllers/FollowKeyController.ts b/src/content/controllers/FollowKeyController.ts
index 59d2271..0fd94ff 100644
--- a/src/content/controllers/FollowKeyController.ts
+++ b/src/content/controllers/FollowKeyController.ts
@@ -1,6 +1,6 @@
import { injectable } from 'tsyringe';
import FollowSlaveUseCase from '../usecases/FollowSlaveUseCase';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
@injectable()
export default class FollowKeyController {
diff --git a/src/content/controllers/KeymapController.ts b/src/content/controllers/KeymapController.ts
index fcfaff1..6157a71 100644
--- a/src/content/controllers/KeymapController.ts
+++ b/src/content/controllers/KeymapController.ts
@@ -9,7 +9,7 @@ import ClipboardUseCase from '../usecases/ClipboardUseCase';
import OperationClient from '../client/OperationClient';
import MarkKeyyUseCase from '../usecases/MarkKeyUseCase';
import FollowMasterClient from '../client/FollowMasterClient';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
@injectable()
export default class KeymapController {
diff --git a/src/content/controllers/MarkKeyController.ts b/src/content/controllers/MarkKeyController.ts
index 886e5ff..e7653ee 100644
--- a/src/content/controllers/MarkKeyController.ts
+++ b/src/content/controllers/MarkKeyController.ts
@@ -1,7 +1,7 @@
import { injectable } from 'tsyringe';
import MarkUseCase from '../usecases/MarkUseCase';
import MarkKeyyUseCase from '../usecases/MarkKeyUseCase';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
@injectable()
export default class MarkKeyController {
diff --git a/src/content/controllers/SettingController.ts b/src/content/controllers/SettingController.ts
index 7fb045b..06273a0 100644
--- a/src/content/controllers/SettingController.ts
+++ b/src/content/controllers/SettingController.ts
@@ -1,8 +1,6 @@
import { injectable } from 'tsyringe';
import AddonEnabledUseCase from '../usecases/AddonEnabledUseCase';
import SettingUseCase from '../usecases/SettingUseCase';
-import * as blacklists from '../../shared/blacklists';
-
import * as messages from '../../shared/messages';
@injectable()
@@ -17,9 +15,7 @@ export default class SettingController {
async initSettings(): Promise<void> {
try {
let current = await this.settingUseCase.reload();
- let disabled = blacklists.includes(
- current.blacklist, window.location.href,
- );
+ let disabled = current.blacklist.includes(window.location.href);
if (disabled) {
this.addonEnabledUseCase.disable();
} else {
diff --git a/src/content/domains/Key.ts b/src/content/domains/Key.ts
deleted file mode 100644
index b25616e..0000000
--- a/src/content/domains/Key.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-export default interface Key {
- key: string;
- shiftKey?: boolean;
- ctrlKey?: boolean;
- altKey?: boolean;
- metaKey?: boolean;
-}
-
-const modifiedKeyName = (name: string): string => {
- if (name === ' ') {
- return 'Space';
- }
- if (name.length === 1) {
- return name;
- } else if (name === 'Escape') {
- return 'Esc';
- }
- return name;
-};
-
-export const fromKeyboardEvent = (e: KeyboardEvent): Key => {
- let key = modifiedKeyName(e.key);
- let shift = e.shiftKey;
- if (key.length === 1 && key.toUpperCase() === key.toLowerCase()) {
- // make shift false for symbols to enable key bindings by symbold keys.
- // But this limits key bindings by symbol keys with Shift (such as Shift+$>.
- shift = false;
- }
-
- return {
- key: modifiedKeyName(e.key),
- shiftKey: shift,
- ctrlKey: e.ctrlKey,
- altKey: e.altKey,
- metaKey: e.metaKey,
- };
-};
-
-export const fromMapKey = (key: string): Key => {
- if (key.startsWith('<') && key.endsWith('>')) {
- let inner = key.slice(1, -1);
- let shift = inner.includes('S-');
- let base = inner.slice(inner.lastIndexOf('-') + 1);
- if (shift && base.length === 1) {
- base = base.toUpperCase();
- } else if (!shift && base.length === 1) {
- base = base.toLowerCase();
- }
- return {
- key: base,
- shiftKey: inner.includes('S-'),
- ctrlKey: inner.includes('C-'),
- altKey: inner.includes('A-'),
- metaKey: inner.includes('M-'),
- };
- }
- return {
- key: key,
- shiftKey: key.toLowerCase() !== key,
- ctrlKey: false,
- altKey: false,
- metaKey: false,
- };
-};
-
-export const equals = (e1: Key, e2: Key): boolean => {
- return e1.key === e2.key &&
- e1.ctrlKey === e2.ctrlKey &&
- e1.metaKey === e2.metaKey &&
- e1.altKey === e2.altKey &&
- e1.shiftKey === e2.shiftKey;
-};
diff --git a/src/content/domains/KeySequence.ts b/src/content/domains/KeySequence.ts
deleted file mode 100644
index 6a05c2f..0000000
--- a/src/content/domains/KeySequence.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import Key, * as keyUtils from './Key';
-
-export default class KeySequence {
- private keys: Key[];
-
- private constructor(keys: Key[]) {
- this.keys = keys;
- }
-
- static from(keys: Key[]): KeySequence {
- return new KeySequence(keys);
- }
-
- push(key: Key): number {
- return this.keys.push(key);
- }
-
- length(): number {
- return this.keys.length;
- }
-
- startsWith(o: KeySequence): boolean {
- if (this.keys.length < o.keys.length) {
- return false;
- }
- for (let i = 0; i < o.keys.length; ++i) {
- if (!keyUtils.equals(this.keys[i], o.keys[i])) {
- return false;
- }
- }
- return true;
- }
-
- getKeyArray(): Key[] {
- return this.keys;
- }
-}
-
-export const fromMapKeys = (keys: string): KeySequence => {
- const fromMapKeysRecursive = (
- remainings: string, mappedKeys: Key[],
- ): Key[] => {
- if (remainings.length === 0) {
- return mappedKeys;
- }
-
- let nextPos = 1;
- if (remainings.startsWith('<')) {
- let ltPos = remainings.indexOf('>');
- if (ltPos > 0) {
- nextPos = ltPos + 1;
- }
- }
-
- return fromMapKeysRecursive(
- remainings.slice(nextPos),
- mappedKeys.concat([keyUtils.fromMapKey(remainings.slice(0, nextPos))])
- );
- };
-
- let data = fromMapKeysRecursive(keys, []);
- return KeySequence.from(data);
-};
-
diff --git a/src/content/repositories/KeymapRepository.ts b/src/content/repositories/KeymapRepository.ts
index d7b5b7d..3391229 100644
--- a/src/content/repositories/KeymapRepository.ts
+++ b/src/content/repositories/KeymapRepository.ts
@@ -1,5 +1,5 @@
-import Key from '../domains/Key';
-import KeySequence from '../domains/KeySequence';
+import Key from '../../shared/settings/Key';
+import KeySequence from '../../shared/settings/KeySequence';
export default interface KeymapRepository {
enqueueKey(key: Key): KeySequence;
@@ -7,7 +7,7 @@ export default interface KeymapRepository {
clear(): void;
}
-let current: KeySequence = KeySequence.from([]);
+let current: KeySequence = new KeySequence([]);
export class KeymapRepositoryImpl {
@@ -17,6 +17,6 @@ export class KeymapRepositoryImpl {
}
clear(): void {
- current = KeySequence.from([]);
+ current = new KeySequence([]);
}
}
diff --git a/src/content/repositories/SettingRepository.ts b/src/content/repositories/SettingRepository.ts
index d718794..4ba26e0 100644
--- a/src/content/repositories/SettingRepository.ts
+++ b/src/content/repositories/SettingRepository.ts
@@ -1,4 +1,4 @@
-import Settings, { DefaultSetting } from '../../shared/Settings';
+import Settings, { DefaultSetting } from '../../shared/settings/Settings';
let current: Settings = DefaultSetting;
diff --git a/src/content/usecases/FollowSlaveUseCase.ts b/src/content/usecases/FollowSlaveUseCase.ts
index 2bd16ee..d471adb 100644
--- a/src/content/usecases/FollowSlaveUseCase.ts
+++ b/src/content/usecases/FollowSlaveUseCase.ts
@@ -4,7 +4,7 @@ import FollowPresenter from '../presenters/FollowPresenter';
import TabsClient from '../client/TabsClient';
import FollowMasterClient from '../client/FollowMasterClient';
import { LinkHint, InputHint } from '../presenters/Hint';
-import Key from '../domains/Key';
+import Key from '../../shared/settings/Key';
interface Size {
width: number;
diff --git a/src/content/usecases/KeymapUseCase.ts b/src/content/usecases/KeymapUseCase.ts
index d0d039a..495f6d0 100644
--- a/src/content/usecases/KeymapUseCase.ts
+++ b/src/content/usecases/KeymapUseCase.ts
@@ -3,16 +3,16 @@ import KeymapRepository from '../repositories/KeymapRepository';
import SettingRepository from '../repositories/SettingRepository';
import AddonEnabledRepository from '../repositories/AddonEnabledRepository';
import * as operations from '../../shared/operations';
-import { Keymaps } from '../../shared/Settings';
-import Key from '../domains/Key';
-import KeySequence, * as keySequenceUtils from '../domains/KeySequence';
+import Keymaps from '../../shared/settings/Keymaps';
+import Key from '../../shared/settings/Key';
+import KeySequence from '../../shared/settings/KeySequence';
type KeymapEntityMap = Map<KeySequence, operations.Operation>;
-const reservedKeymaps: Keymaps = {
+const reservedKeymaps = Keymaps.fromJSON({
'<Esc>': { type: operations.CANCEL },
'<C-[>': { type: operations.CANCEL },
-};
+});
@injectable()
export default class KeymapUseCase {
@@ -65,16 +65,10 @@ export default class KeymapUseCase {
}
private keymapEntityMap(): KeymapEntityMap {
- let keymaps = {
- ...this.settingRepository.get().keymaps,
- ...reservedKeymaps,
- };
- let entries = Object.entries(keymaps).map((entry) => {
- return [
- keySequenceUtils.fromMapKeys(entry[0]),
- entry[1],
- ];
- }) as [KeySequence, operations.Operation][];
+ let keymaps = this.settingRepository.get().keymaps.combine(reservedKeymaps);
+ let entries = keymaps.entries().map(
+ ([keys, op]) => [KeySequence.fromMapKeys(keys), op]
+ ) as [KeySequence, operations.Operation][];
return new Map<KeySequence, operations.Operation>(entries);
}
}
diff --git a/src/content/usecases/SettingUseCase.ts b/src/content/usecases/SettingUseCase.ts
index d5f66c6..4608039 100644
--- a/src/content/usecases/SettingUseCase.ts
+++ b/src/content/usecases/SettingUseCase.ts
@@ -1,7 +1,7 @@
import { injectable, inject } from 'tsyringe';
import SettingRepository from '../repositories/SettingRepository';
import SettingClient from '../client/SettingClient';
-import Settings from '../../shared/Settings';
+import Settings from '../../shared/settings/Settings';
@injectable()
export default class SettingUseCase {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 03:37:43 +0000