diff options
| author | Stephen Blott | 2015-06-09 14:47:39 +0100 | 
|---|---|---|
| committer | Stephen Blott | 2015-06-09 14:47:39 +0100 | 
| commit | 98a3f4c96e8b189ca142f7cccbc1ef995c158b9d (patch) | |
| tree | 46a249e083cb7a2861bbeb82f54862fbb975965f /tests | |
| parent | a7712e6ed48c89417846c0f516754551cf2d5d53 (diff) | |
| download | vimium-98a3f4c96e8b189ca142f7cccbc1ef995c158b9d.tar.bz2 | |
Make LinkHints a class (LinkHintsMode).
Functionality wise, this is a no-op.  However, since we now create a new
LinkHintsMode object on every "f", we don't need to be so careful about
resetting the state on exit.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dom_tests/dom_tests.coffee | 32 | 
1 files changed, 16 insertions, 16 deletions
| diff --git a/tests/dom_tests/dom_tests.coffee b/tests/dom_tests/dom_tests.coffee index 8f293075..dd2f5a5d 100644 --- a/tests/dom_tests/dom_tests.coffee +++ b/tests/dom_tests/dom_tests.coffee @@ -67,27 +67,27 @@ createGeneralHintTests = (isFilteredMode) ->        document.getElementById("test-div").innerHTML = ""      should "create hints when activated, discard them when deactivated", -> -      LinkHints.activateMode() -      assert.isFalse not LinkHints.hintMarkerContainingDiv? -      LinkHints.deactivateMode() -      assert.isTrue not LinkHints.hintMarkerContainingDiv? +      linkHints = LinkHints.activateMode() +      assert.isFalse not linkHints.hintMarkerContainingDiv? +      linkHints.deactivateMode() +      assert.isTrue not linkHints.hintMarkerContainingDiv?      should "position items correctly", ->        assertStartPosition = (element1, element2) ->          assert.equal element1.getClientRects()[0].left, element2.getClientRects()[0].left          assert.equal element1.getClientRects()[0].top, element2.getClientRects()[0].top        stub document.body, "style", "static" -      LinkHints.activateMode() +      linkHints = LinkHints.activateMode()        hintMarkers = getHintMarkers()        assertStartPosition document.getElementsByTagName("a")[0], hintMarkers[0]        assertStartPosition document.getElementsByTagName("a")[1], hintMarkers[1] -      LinkHints.deactivateMode() +      linkHints.deactivateMode()        stub document.body.style, "position", "relative" -      LinkHints.activateMode() +      linkHints = LinkHints.activateMode()        hintMarkers = getHintMarkers()        assertStartPosition document.getElementsByTagName("a")[0], hintMarkers[0]        assertStartPosition document.getElementsByTagName("a")[1], hintMarkers[1] -      LinkHints.deactivateMode() +      linkHints.deactivateMode()  createGeneralHintTests false  createGeneralHintTests true @@ -142,10 +142,10 @@ context "Alphabetical link hints",      # Three hints will trigger double hint chars.      createLinks 3 -    LinkHints.activateMode() +    @linkHints = LinkHints.activateMode()    tearDown -> -    LinkHints.deactivateMode() +    @linkHints.deactivateMode()      document.getElementById("test-div").innerHTML = ""    should "label the hints correctly", -> @@ -177,11 +177,11 @@ context "Filtered link hints",        initializeModeState()        testContent = "<a>test</a>" + "<a>tress</a>" + "<a>trait</a>" + "<a>track<img alt='alt text'/></a>"        document.getElementById("test-div").innerHTML = testContent -      LinkHints.activateMode() +      @linkHints = LinkHints.activateMode()      tearDown ->        document.getElementById("test-div").innerHTML = "" -      LinkHints.deactivateMode() +      @linkHints.deactivateMode()      should "label the hints", ->        hintMarkers = getHintMarkers() @@ -205,11 +205,11 @@ context "Filtered link hints",        testContent = "<a><img alt='alt text'/></a><a><img alt='alt text' title='some title'/></a>          <a><img title='some title'/></a>" + "<a><img src='' width='320px' height='100px'/></a>"        document.getElementById("test-div").innerHTML = testContent -      LinkHints.activateMode() +      @linkHints = LinkHints.activateMode()      tearDown ->        document.getElementById("test-div").innerHTML = "" -      LinkHints.deactivateMode() +      @linkHints.deactivateMode()      should "label the images", ->        hintMarkers = getHintMarkers() @@ -227,11 +227,11 @@ context "Filtered link hints",          <input type='text' id='test-input' value='some value'/>          <label for='test-input-2'/>a label: </label><input type='text' id='test-input-2' value='some value'/>"        document.getElementById("test-div").innerHTML = testContent -      LinkHints.activateMode() +      @linkHints = LinkHints.activateMode()      tearDown ->        document.getElementById("test-div").innerHTML = "" -      LinkHints.deactivateMode() +      @linkHints.deactivateMode()      should "label the input elements", ->        hintMarkers = getHintMarkers() | 
