diff options
| author | Shin'ya Ueoka <ueokande@i-beam.org> | 2019-12-22 15:13:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-22 15:13:55 +0900 |
| commit | 750be0263207b1275ae3911b5585343b49de2645 (patch) | |
| tree | b635290335c2db71a6723eb7759c84bcf33a34ff /src/content | |
| parent | 896c2cf60d009c9b12d99a394287cfb1d5ee1e3a (diff) | |
| parent | 1c8cef7cf673deb2c3d0c5e0b3617bf2f16d7c74 (diff) | |
Merge pull request #691 from ueokande/enable-addon-on-blacklisted-sites
Enable addon on blacklisted sites
Diffstat (limited to 'src/content')
| -rw-r--r-- | src/content/controllers/SettingController.ts | 4 | ||||
| -rw-r--r-- | src/content/usecases/KeymapUseCase.ts | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/content/controllers/SettingController.ts b/src/content/controllers/SettingController.ts index 9124188..2d32c09 100644 --- a/src/content/controllers/SettingController.ts +++ b/src/content/controllers/SettingController.ts @@ -18,9 +18,9 @@ export default class SettingController { const url = new URL(window.location.href); const disabled = current.blacklist.includesEntireBlacklist(url); if (disabled) { - this.addonEnabledUseCase.disable(); + await this.addonEnabledUseCase.disable(); } else { - this.addonEnabledUseCase.enable(); + await this.addonEnabledUseCase.enable(); } } catch (e) { // Sometime sendMessage fails when background script is not ready. diff --git a/src/content/usecases/KeymapUseCase.ts b/src/content/usecases/KeymapUseCase.ts index 074de72..7aa7e92 100644 --- a/src/content/usecases/KeymapUseCase.ts +++ b/src/content/usecases/KeymapUseCase.ts @@ -39,16 +39,16 @@ export default class KeymapUseCase { nextOps(key: Key): { repeat: number, op: operations.Operation } | null { const sequence = this.repository.enqueueKey(key); const baseSequence = sequence.trimNumericPrefix(); + const keymaps = this.keymapEntityMap(); + const matched = keymaps.filter(([seq]) => seq.startsWith(sequence)); + const baseMatched = keymaps.filter(([seq]) => seq.startsWith(baseSequence)); + if (baseSequence.length() === 1 && this.blacklistKey(key)) { // ignore if the input starts with black list keys this.repository.clear(); return null; } - const keymaps = this.keymapEntityMap(); - const matched = keymaps.filter(([seq]) => seq.startsWith(sequence)); - const baseMatched = keymaps.filter(([seq]) => seq.startsWith(baseSequence)); - if (matched.length === 1 && sequence.length() === matched[0][0].length()) { // keys are matched with an operation |