Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parsers and state in content #962

Merged
merged 11 commits into from Sep 4, 2018

fix name of content state script to fit style

  • Loading branch information...
saulrh committed Sep 1, 2018
commit 90fa242e84b02f2d6b66b43d0dde63d59f0a0730
@@ -12,7 +12,7 @@ const logger = new Logging.Logger("content")
logger.debug("Tridactyl content script loaded, boss!")

// Our local state
import {contentState, addContentStateChangedListener } from "./content_state"
import {contentState, addContentStateChangedListener } from "./state_content"

// Hook the keyboard up to the controller
import * as ContentController from "./controller_content"
@@ -1,6 +1,6 @@
import { MsgSafeKeyboardEvent, MsgSafeNode, KeyboardEvent } from "./msgsafe"
import { isTextEditable } from "./dom"
import { contentState, ModeName } from "./content_state"
import { contentState, ModeName } from "./state_content"
import { repeat } from "./.excmds_background.generated"
import Logger from "./logging"
import * as messaging from "./messaging"
@@ -99,7 +99,7 @@ import * as Messaging from "./messaging"
import { browserBg, activeTabId, activeTabContainerId, openInNewTab, openInNewWindow } from "./lib/webext"
import * as Container from "./lib/containers"
import state from "./state"
import { contentState, ModeName } from "./content_state"
import { contentState, ModeName } from "./state_content"
import * as UrlUtil from "./url_util"
import * as config from "./config"
import * as aliases from "./aliases"
@@ -12,7 +12,7 @@

import * as DOM from "./dom"
import { hasModifiers } from "./keyseq"
import { contentState } from "./content_state"
import { contentState } from "./state_content"
import { messageActiveTab, message } from "./messaging"
import * as config from "./config"
import Logger from "./logging"
@@ -20,7 +20,7 @@ import {
unique,
} from "./itertools"
import { hasModifiers } from "./keyseq"
import { contentState } from "./content_state"
import { contentState } from "./state_content"
import { messageActiveTab, message } from "./messaging"
import * as config from "./config"
import * as TTS from "./text_to_speech"
@@ -1,4 +1,4 @@
import { contentState } from "../content_state"
import { contentState } from "../state_content"
import { isSimpleKey } from "../keyseq"
import { MsgSafeKeyboardEvent } from "../msgsafe"

File renamed without changes.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.