From 8670ed1136889df5f26f8807f1f209e5adbe0b7f Mon Sep 17 00:00:00 2001
From: Saul Reynolds-Haertle <sreynoldshaertle@gmail.com>
Date: Sat, 29 Sep 2018 17:07:29 -0700
Subject: [PATCH] move src/dom.ts to src/lib/

---
 src/background.ts                 | 2 +-
 src/content.ts                    | 4 ++--
 src/content/controller_content.ts | 2 +-
 src/content/finding.ts            | 2 +-
 src/content/hinting.ts            | 2 +-
 src/excmds.ts                     | 2 +-
 src/{ => lib}/dom.ts              | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{ => lib}/dom.ts (99%)

diff --git a/src/background.ts b/src/background.ts
index 035ad3ab..974e7d12 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -9,7 +9,7 @@ import * as excmds from "./.excmds_background.generated"
 import * as commandline_background from "@src/background/commandline_background"
 import * as convert from "@src/lib/convert"
 import * as config from "@src/lib/config"
-import * as dom from "./dom"
+import * as dom from "@src/lib/dom"
 import * as download_background from "@src/background/download_background"
 import * as itertools from "@src/lib/itertools"
 import * as keyseq from "./keyseq"
diff --git a/src/content.ts b/src/content.ts
index 866fe34b..2f269e56 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -16,7 +16,7 @@ import { contentState, addContentStateChangedListener } from "@src/content/state
 
 // Hook the keyboard up to the controller
 import * as ContentController from "@src/content/controller_content"
-import { getAllDocumentFrames } from "./dom"
+import { getAllDocumentFrames } from "@src/lib/dom"
 window.addEventListener("keydown", ContentController.acceptKey, true)
 document.addEventListener("readystatechange", ev =>
     getAllDocumentFrames().map(frame => {
@@ -37,7 +37,7 @@ document.addEventListener("readystatechange", ev =>
 import * as commandline_content from "@src/content/commandline_content"
 import * as convert from "@src/lib/convert"
 import * as config from "@src/lib/config"
-import * as dom from "./dom"
+import * as dom from "@src/lib/dom"
 import * as excmds from "./.excmds_content.generated"
 import * as hinting_content from "@src/content/hinting"
 import * as finding_content from "@src/content/finding"
diff --git a/src/content/controller_content.ts b/src/content/controller_content.ts
index 07d4b74e..ca76c233 100644
--- a/src/content/controller_content.ts
+++ b/src/content/controller_content.ts
@@ -1,4 +1,4 @@
-import { isTextEditable } from "@src/dom"
+import { isTextEditable } from "@src/lib/dom"
 import { contentState, ModeName } from "@src/content/state_content"
 import { repeat } from "@src/.excmds_background.generated"
 import Logger from "@src/lib/logging"
diff --git a/src/content/finding.ts b/src/content/finding.ts
index 2ca6b74c..5edf0477 100644
--- a/src/content/finding.ts
+++ b/src/content/finding.ts
@@ -10,7 +10,7 @@
         allow spaces
 */
 
-import * as DOM from "@src/dom"
+import * as DOM from "@src/lib/dom"
 import { hasModifiers } from "@src/keyseq"
 import { contentState } from "@src/content/state_content"
 import { messageActiveTab, message } from "@src/lib/messaging"
diff --git a/src/content/hinting.ts b/src/content/hinting.ts
index abf51bca..e589d541 100644
--- a/src/content/hinting.ts
+++ b/src/content/hinting.ts
@@ -10,7 +10,7 @@
         Redraw on reflow
 */
 
-import * as DOM from "@src/dom"
+import * as DOM from "@src/lib/dom"
 import { log } from "@src/lib/math"
 import {
     permutationsWithReplacement,
diff --git a/src/excmds.ts b/src/excmds.ts
index 34f995d2..511c0542 100644
--- a/src/excmds.ts
+++ b/src/excmds.ts
@@ -112,7 +112,7 @@ import { fitsType, typeToString } from "@src/lib/metadata"
 import "@src/lib/number.clamp"
 import * as SELF from "./.excmds_content.generated"
 Messaging.addListener("excmd_content", Messaging.attributeCaller(SELF))
-import * as DOM from "./dom"
+import * as DOM from "@src/lib/dom"
 import { executeWithoutCommandLine } from "@src/content/commandline_content"
 import * as scrolling from "@src/content/scrolling"
 // }
diff --git a/src/dom.ts b/src/lib/dom.ts
similarity index 99%
rename from src/dom.ts
rename to src/lib/dom.ts
index 998eda42..d6ea741e 100644
--- a/src/dom.ts
+++ b/src/lib/dom.ts
@@ -1,8 +1,8 @@
 import * as config from "@src/lib/config"
 import { flatten } from "@src/lib/itertools"
-import state from "./state"
+import state from "@src/state"
 import * as Logging from "@src/lib/logging"
-import { activeTabId, openInNewTab, activeTabContainerId } from "./lib/webext"
+import { activeTabId, openInNewTab, activeTabContainerId } from "@src/lib/webext"
 const logger = new Logging.Logger("dom")
 
 // From saka-key lib/dom.js, under Apachev2