From 9847144f3493547af7eb419f11552ac18d7e9872 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Sat, 28 Oct 2017 17:09:24 +0100
Subject: Remove normal mode commands from global scope

---
 content_scripts/mode_normal.coffee |  1 -
 tests/dom_tests/dom_tests.coffee   | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/content_scripts/mode_normal.coffee b/content_scripts/mode_normal.coffee
index d6f2934e..02681475 100644
--- a/content_scripts/mode_normal.coffee
+++ b/content_scripts/mode_normal.coffee
@@ -220,5 +220,4 @@ textInputXPath = (->
 root = exports ? (window.root ?= {})
 root.NormalMode = NormalMode
 root.NormalModeCommands = NormalModeCommands
-extend root, NormalModeCommands
 extend window, root unless exports?
diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee
index a5c85606..6e422d46 100644
--- a/tests/dom_tests/dom_tests.coffee
+++ b/tests/dom_tests/dom_tests.coffee
@@ -436,29 +436,29 @@ context "Input focus",
     document.getElementById("test-div").innerHTML = ""
 
   should "focus the first element", ->
-    focusInput 1
+    NormalModeCommands.focusInput 1
     assert.equal "first", document.activeElement.id
 
   should "focus the nth element", ->
-    focusInput 100
+    NormalModeCommands.focusInput 100
     assert.equal "third", document.activeElement.id
 
   should "activate insert mode on the first element", ->
-    focusInput 1
+    NormalModeCommands.focusInput 1
     assert.isTrue InsertMode.permanentInstance.isActive()
 
   should "activate insert mode on the first element", ->
-    focusInput 100
+    NormalModeCommands.focusInput 100
     assert.isTrue InsertMode.permanentInstance.isActive()
 
   should "activate the most recently-selected input if the count is 1", ->
-    focusInput 3
-    focusInput 1
+    NormalModeCommands.focusInput 3
+    NormalModeCommands.focusInput 1
     assert.equal "third", document.activeElement.id
 
   should "not trigger insert if there are no inputs", ->
     document.getElementById("test-div").innerHTML = ""
-    focusInput 1
+    NormalModeCommands.focusInput 1
     assert.isFalse InsertMode.permanentInstance.isActive()
 
 # TODO: these find prev/next link tests could be refactored into unit tests which invoke a function which has
@@ -479,7 +479,7 @@ context "Find prev / next links",
     <a href='#second'>next page</a>
     """
     stubSettings "nextPatterns", "next"
-    goNext()
+    NormalModeCommands.goNext()
     assert.equal '#second', window.location.hash
 
   should "match against non-word patterns", ->
@@ -487,7 +487,7 @@ context "Find prev / next links",
     <a href='#first'>&gt;&gt;</a>
     """
     stubSettings "nextPatterns", ">>"
-    goNext()
+    NormalModeCommands.goNext()
     assert.equal '#first', window.location.hash
 
   should "favor matches with fewer words", ->
@@ -496,14 +496,14 @@ context "Find prev / next links",
     <a href='#second'>next!</a>
     """
     stubSettings "nextPatterns", "next"
-    goNext()
+    NormalModeCommands.goNext()
     assert.equal '#second', window.location.hash
 
   should "find link relation in header", ->
     document.getElementById("test-div").innerHTML = """
     <link rel='next' href='#first'>
     """
-    goNext()
+    NormalModeCommands.goNext()
     assert.equal '#first', window.location.hash
 
   should "favor link relation to text matching", ->
@@ -511,14 +511,14 @@ context "Find prev / next links",
     <link rel='next' href='#first'>
     <a href='#second'>next</a>
     """
-    goNext()
+    NormalModeCommands.goNext()
     assert.equal '#first', window.location.hash
 
   should "match mixed case link relation", ->
     document.getElementById("test-div").innerHTML = """
     <link rel='Next' href='#first'>
     """
-    goNext()
+    NormalModeCommands.goNext()
     assert.equal '#first', window.location.hash
 
 createLinks = (n) ->
-- 
cgit v1.2.3